Update pigweed to 78d0730d (#7566)

project-chip · Jul 8, 2021 · f6fd87c · f6fd87c
1 parent dec18f3
commit f6fd87c
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 81 deletions.
diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni
@@ -20,4 +20,9 @@ pw_assert_BACKEND = "$dir_pw_assert_log"
 pw_sys_io_BACKEND =
     "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32"
 
+pw_build_LINK_DEPS = [
+  "$dir_pw_assert:impl",
+  "$dir_pw_log:impl",
+]
+
 dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -60,11 +60,13 @@ chip_gn_arg_append("esp32_cpu"             "\"esp32\"")
 chip_gn_arg_bool("is_debug"                is_debug)
 
 if(CONFIG_ENABLE_PW_RPC)
+    string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n")
     chip_gn_arg_append("chip_build_pw_rpc_lib"              "true")
     chip_gn_arg_append("pw_log_BACKEND"                     "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"")
     chip_gn_arg_append("pw_assert_BACKEND"                  "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"")
     chip_gn_arg_append("pw_sys_io_BACKEND"                  "\"//third_party/connectedhomeip/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32\"")
     chip_gn_arg_append("dir_pw_third_party_nanopb"          "\"//third_party/connectedhomeip/third_party/nanopb/repo\"")
+    chip_gn_arg_append("pw_build_LINK_DEPS"                 "[\"\$dir_pw_assert:impl\", \"\$dir_pw_log:impl\"]")
 endif()
 
 if (NOT CONFIG_USE_MINIMAL_MDNS)

diff --git a/config/esp32/lib/pw_rpc/BUILD.gn b/config/esp32/lib/pw_rpc/BUILD.gn
@@ -30,6 +30,8 @@ static_library("pw_rpc") {
     dir_pw_log,
   ]
 
+  deps += pw_build_LINK_DEPS
+
   output_dir = "${root_out_dir}/lib"
 
   complete_static_lib = true

diff --git a/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni
@@ -22,4 +22,9 @@ pw_sys_io_BACKEND =
 pw_rpc_system_server_BACKEND =
     "${chip_root}/examples/common/pigweed:system_rpc_server"
 
+pw_build_LINK_DEPS = [
+  "$dir_pw_assert:impl",
+  "$dir_pw_log:impl",
+]
+
 dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -25,6 +25,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 
 if (chip_enable_pw_rpc) {
   import("//build_overrides/pigweed.gni")
+  import("$dir_pw_build/target_types.gni")
 }
 
 assert(current_os == "freertos")
@@ -136,6 +137,8 @@ efr32_executable("lighting_app") {
       "${examples_plat_dir}/pw_sys_io:pw_sys_io_efr32",
     ]
 
+    deps += pw_build_LINK_DEPS
+
     include_dirs += [
       "${chip_root}/examples/common",
       "${chip_root}/examples/common/pigweed/efr32",

diff --git a/examples/lighting-app/linux/BUILD.gn b/examples/lighting-app/linux/BUILD.gn
@@ -21,6 +21,11 @@ assert(chip_build_tools)
 
 import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 
+if (chip_enable_pw_rpc) {
+  import("//build_overrides/pigweed.gni")
+  import("$dir_pw_build/target_types.gni")
+}
+
 config("includes") {
   include_dirs = [
     ".",
@@ -47,8 +52,6 @@ executable("chip-lighting-app") {
   cflags = [ "-Wconversion" ]
 
   if (chip_enable_pw_rpc) {
-    import("//build_overrides/pigweed.gni")
-
     defines = [ "PW_RPC_ENABLED" ]
 
     sources += [
@@ -71,6 +74,8 @@ executable("chip-lighting-app") {
       "${chip_root}/examples/common/pigweed:device_service.nanopb_rpc",
       "${chip_root}/examples/lighting-app/lighting-common:lighting_service.nanopb_rpc",
     ]
+
+    deps += pw_build_LINK_DEPS
   }
 
   output_dir = root_out_dir

diff --git a/examples/lighting-app/linux/with_pw_rpc.gni b/examples/lighting-app/linux/with_pw_rpc.gni
@@ -32,4 +32,9 @@ dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo"
 pw_chrono_SYSTEM_CLOCK_BACKEND = "$dir_pw_chrono_stl:system_clock"
 pw_sync_MUTEX_BACKEND = "$dir_pw_sync_stl:mutex_backend"
 
+pw_build_LINK_DEPS = [
+  "$dir_pw_assert:impl",
+  "$dir_pw_log:impl",
+]
+
 chip_enable_pw_rpc = true
diff --git a/examples/pigweed-app/esp32/main/CMakeLists.txt b/examples/pigweed-app/esp32/main/CMakeLists.txt
@@ -36,6 +36,7 @@ idf_component_register(INCLUDE_DIRS
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/nanopb/public"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/raw/public"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_protobuf/public"
+                     "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_function/public"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_status/public"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_stream/public"
                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/pigweed/repo/pw_result/public"

diff --git a/scripts/environment.json b/scripts/environment.json
@@ -1,5 +1,8 @@
 {
-    "cipd_package_files": ["scripts/pigweed.json"],
+    "cipd_package_files": [
+        "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+        "scripts/python.json"
+    ],
     "virtualenv": {
         "gn_root": ".",
         "gn_targets": [":python_packages.install"]

diff --git a/scripts/pigweed.json b/scripts/pigweed.json
diff --git a/scripts/python.json b/scripts/python.json
@@ -0,0 +1,7 @@
+[
+    {
+        "path": "infra/3pp/tools/cpython3/${platform}",
+        "platforms": ["mac-amd64", "windows-amd64"],
+        "tags": ["version:3.8.2.chromium.10"]
+    }
+]
diff --git a/src/lib/support/pw_log_chip/BUILD.gn b/src/lib/support/pw_log_chip/BUILD.gn
@@ -25,7 +25,11 @@ config("config") {
 
 pw_source_set("pw_log_chip") {
   public_configs = [ ":config" ]
-  public_deps = [ "${chip_root}/src/lib/support" ]
+  public_deps = [ ":pw_log_chip.impl" ]
   public = [ "public_overrides/pw_log_backend/log_backend.h" ]
   sources = [ "public/pw_log_chip/log_chip.h" ]
 }
+
+pw_source_set("pw_log_chip.impl") {
+  public_deps = [ "${chip_root}/src/lib/support" ]
+}
diff --git a/src/platform/EFR32/args.gni b/src/platform/EFR32/args.gni
@@ -14,6 +14,7 @@
 
 import("//build_overrides/chip.gni")
 import("//build_overrides/efr32_sdk.gni")
+import("//build_overrides/pigweed.gni")
 
 import("${chip_root}/examples/platform/efr32/args.gni")
 
@@ -46,3 +47,8 @@ openthread_external_platform =
     "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
 
 chip_config_memory_management = "platform"
+
+pw_build_LINK_DEPS = [
+  "$dir_pw_assert:impl",
+  "$dir_pw_log:impl",
+]
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo