commit 4c5dd65ce5644fc06d189aad04c03570b568ff7d
author Rob Mohr <mohrr@google.com> Wed Mar 16 23:45:17 2022 -0700
committer GitHub <noreply@github.com> Thu Mar 17 02:45:17 2022 -0400
tree 5678874d1b8a8f787e6b522cec5688db06d92a62
parent f9d2e40a6d59682c6c8fedea1aaf5e0970e98e9e

Roll Pigweed (#16317)

Also specify environment GNI file location.

.gitignore

diff --git a/.gitignore b/.gitignore
index 878192f..6f9bc78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,9 @@
 /src/test_driver/nrfconnect/build/
 /src/darwin/Framework/build/
 
-# Environment directory
+# Pigweed Environment
 .environment/
+build_overrides/pigweed_environment.gni
 
 # Temporary Directories
 .tmp/

scripts/environment.json

diff --git a/scripts/environment.json b/scripts/environment.json
index 4662e6d..afe5681 100644
--- a/scripts/environment.json
+++ b/scripts/environment.json
@@ -8,5 +8,6 @@
         "gn_root": ".",
         "gn_targets": [":python_packages.install"]
     },
-    "required_submodules": ["third_party/pigweed/repo"]
+    "required_submodules": ["third_party/pigweed/repo"],
+    "gni_file": "build_overrides/pigweed_environment.gni"
 }

scripts/environment_no_cipd.json

diff --git a/scripts/environment_no_cipd.json b/scripts/environment_no_cipd.json
index 0548864..3efe20c 100644
--- a/scripts/environment_no_cipd.json
+++ b/scripts/environment_no_cipd.json
@@ -2,5 +2,6 @@
     "virtualenv": {
         "gn_root": ".",
         "gn_targets": [":python_packages.install"]
-    }
+    },
+    "gni_file": "build_overrides/pigweed_environment.gni"
 }

third_party/pigweed/repo

diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 79525f5..86698c0 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 79525f59ff502d80346c9cc8e70570786c5fc903
+Subproject commit 86698c0b9620febe11cc274a44c9457e6127dd62