Pull submodules (#4826)
Via scripts/helpers/pull_submodules.sh
Updates:
git -C examples/common/QRCode/repo log 8cbd1f5..8518684
git -C third_party/bluez/repo log 83c8c1e92..1f4ec8fb9
git -C third_party/nanopb/repo log 35965fd..049485f
git -C third_party/pigweed/repo log 293e1c16..bbe291b3
git -C third_party/qpg_sdk/repo log 8fd6c4b..9ee45ac
git -C third_party/zap/repo log f462cc9..a2fb014diff --git a/.gitmodules b/.gitmodules
index 6186ba6..fd9e0b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -70,6 +70,7 @@
path = third_party/freertos/repo
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
branch = V10.3.1-kernel-only
-[submodule "third_party/efr32_sdk/repo"]
+[submodule "efr32_sdk"]
path = third_party/efr32_sdk/repo
url = https://github.com/SiliconLabs/sdk_support.git
+ branch = master
diff --git a/BUILD.gn b/BUILD.gn
index d653baa..66ee342 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -39,6 +39,18 @@
# Python packages for supporting specific targets.
pw_python_group("python_packages") {
python_deps = [
+ "$dir_pw_build/py",
+ "$dir_pw_doctor/py",
+ "$dir_pw_env_setup/py",
+ "$dir_pw_hdlc/py",
+ "$dir_pw_module/py",
+ "$dir_pw_protobuf/py",
+ "$dir_pw_protobuf_compiler/py",
+ "$dir_pw_rpc/py",
+ "$dir_pw_status/py",
+ "$dir_pw_toolchain/py",
+ "$dir_pw_unit_test/py",
+ "$dir_pw_watch/py",
"integrations/mobly:chip_mobly",
"third_party/happy",
]
diff --git a/examples/common/QRCode/repo b/examples/common/QRCode/repo
index 8cbd1f5..8518684 160000
--- a/examples/common/QRCode/repo
+++ b/examples/common/QRCode/repo
@@ -1 +1 @@
-Subproject commit 8cbd1f506ac59406b18d13a199187c2756f2e06f
+Subproject commit 8518684c0f33d004fa93971be2c6a8eca3167d1e
diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
index ad68061..6f877eb 100644
--- a/examples/lighting-app/nrfconnect/CMakeLists.txt
+++ b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -104,6 +104,7 @@
target_link_libraries(app PRIVATE
pigweed_lighting_protolib.nanopb_rpc
+ pw_checksum
pw_hdlc
pw_log
pw_rpc.server
diff --git a/examples/pigweed-app/nrfconnect/CMakeLists.txt b/examples/pigweed-app/nrfconnect/CMakeLists.txt
index f5bbef7..bb95677 100644
--- a/examples/pigweed-app/nrfconnect/CMakeLists.txt
+++ b/examples/pigweed-app/nrfconnect/CMakeLists.txt
@@ -70,6 +70,7 @@
)
target_link_libraries(app PUBLIC
+ pw_checksum
pw_hdlc
pw_log
pw_rpc.nanopb.echo_service
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 9c55b5d..cf307c1 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -68,8 +68,6 @@
--install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" \
--virtualenv-requirements "$_CHIP_ROOT/scripts/requirements.txt" \
--cipd-package-file "$_CHIP_ROOT/scripts/pigweed.json" \
- --virtualenv-gn-target "$PW_ROOT#:target_support_packages.install" \
- --virtualenv-gn-target "$PW_ROOT#:python.install" \
--virtualenv-gn-target "$_CHIP_ROOT#:python_packages.install"
pw_finalize bootstrap "$_SETUP_SH"
else
diff --git a/scripts/pigweed.json b/scripts/pigweed.json
index eeb80b3..e9b3697 100644
--- a/scripts/pigweed.json
+++ b/scripts/pigweed.json
@@ -1,7 +1,7 @@
[
{
"path": "gn/gn/${os}-${arch=amd64,arm64}",
- "tags": ["git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e"]
+ "tags": ["git_revision:d7cf6238e07f87b51118f9823a1ec024c1f1932b"]
},
{
"path": "infra/ninja/${os}-${arch=amd64}",
@@ -25,8 +25,8 @@
"tags": ["version:9-2020-q2-update"]
},
{
- "path": "infra/tools/protoc/${os}-${arch=amd64}",
- "tags": ["protobuf_version:v3.8.0"]
+ "path": "infra/3pp/tools/protoc/${os}-${arch}",
+ "tags": ["version:3.14.0"]
},
{
"_comment": "TODO(pwbug/70) Put clang in cipd for Windows.",
@@ -62,11 +62,11 @@
},
{
"path": "pigweed/host_tools/${os}-${arch=amd64}",
- "tags": ["git_revision:918276537a01f4f470fa61511347d4dfe1c9f297"]
+ "tags": ["git_revision:01145c97424e9158fd9b96b957176de4bb7e8f0c"]
},
{
"path": "infra/goma/client/${os}-${arch=amd64}",
- "tags": ["git_revision:4e2693cc42d116902f0767b9b93643555f79e7c4"]
+ "tags": ["git_revision:be1b7f4547023e809b636dc9572c976ccb33dcac"]
},
{
"path": "fuchsia/third_party/qemu/${os=linux,mac}-${arch}",
diff --git a/third_party/bluez/repo b/third_party/bluez/repo
index 83c8c1e..1f4ec8f 160000
--- a/third_party/bluez/repo
+++ b/third_party/bluez/repo
@@ -1 +1 @@
-Subproject commit 83c8c1e9283d969cd606b04d70f219431408bb76
+Subproject commit 1f4ec8fb9d36fb7678385fd631459d80b57fc662
diff --git a/third_party/nanopb/repo b/third_party/nanopb/repo
index 35965fd..049485f 160000
--- a/third_party/nanopb/repo
+++ b/third_party/nanopb/repo
@@ -1 +1 @@
-Subproject commit 35965fdf3f4ec1b41b08c0616940072a0a611851
+Subproject commit 049485ff557178f646d573eca3bd647f543b760b
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 293e1c1..bbe291b 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 293e1c16d1096fd9c6db800c14a97bcef21ec66f
+Subproject commit bbe291b3ee01bfec87366b7c45db7656b7a9cd43
diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo
index 8fd6c4b..9ee45ac 160000
--- a/third_party/qpg_sdk/repo
+++ b/third_party/qpg_sdk/repo
@@ -1 +1 @@
-Subproject commit 8fd6c4be33522aa3f154ab970ae13f4b36a2ce4a
+Subproject commit 9ee45ac976ad819ed544d025ea4e2cd7b315a768
diff --git a/third_party/zap/repo b/third_party/zap/repo
index f462cc9..a2fb014 160000
--- a/third_party/zap/repo
+++ b/third_party/zap/repo
@@ -1 +1 @@
-Subproject commit f462cc913114a148ebb52b83110daf61e9945594
+Subproject commit a2fb014120efec042e097b1ea8b8c9b0a4eb0623
