From c89ad424d7319d2b1c4256f0ccc37823a308f65f Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Sat, 30 Jul 2022 11:02:31 -0400
Subject: [PATCH] Roll pigweed to 9ac358b4baaad897545b01f2d616ffd51858914b
 (#21437)

---
 .../build_overrides/pigweed_environment.gni   | 30 ++++++++++++++++++-
 third_party/pigweed/repo                      |  2 +-
 2 files changed, 30 insertions(+), 2 deletions(-)
 mode change 120000 => 100644 examples/build_overrides/pigweed_environment.gni

diff --git a/examples/build_overrides/pigweed_environment.gni b/examples/build_overrides/pigweed_environment.gni
deleted file mode 120000
index bb2374b01537e6..00000000000000
--- a/examples/build_overrides/pigweed_environment.gni
+++ /dev/null
@@ -1 +0,0 @@
-../../build_overrides/pigweed_environment.gni
\ No newline at end of file
diff --git a/examples/build_overrides/pigweed_environment.gni b/examples/build_overrides/pigweed_environment.gni
new file mode 100644
index 00000000000000..fb1dee47a874bd
--- /dev/null
+++ b/examples/build_overrides/pigweed_environment.gni
@@ -0,0 +1,29 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# In order to avoid bootstrapping a separate environment for each in-tree
+# example, reuse the environment from the root of the Matter SDK. Use the
+# bootstrap script there to create the environment.
+_bootstrap_root = "//third_party/connectedhomeip"
+
+import("${_bootstrap_root}/build_overrides/pigweed_environment.gni")
+
+# Rebase paths to our root.
+dir_cipd_arm = get_path_info("${_bootstrap_root}/${dir_cipd_arm}", "abspath")
+dir_cipd_pigweed =
+    get_path_info("${_bootstrap_root}/${dir_cipd_pigweed}", "abspath")
+dir_cipd_python =
+    get_path_info("${_bootstrap_root}/${dir_cipd_python}", "abspath")
+dir_virtual_env =
+    get_path_info("${_bootstrap_root}/${dir_virtual_env}", "abspath")
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 2bfd28cc1596bc..9ac358b4baaad8 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 2bfd28cc1596bc3f71b50b0e5d77cd0846e26fdf
+Subproject commit 9ac358b4baaad897545b01f2d616ffd51858914b