Update pigweed to latest master (#36193)

arkq · web-flow · commit 42421c4d7da3 · 2024-10-23T12:25:21.000Z
* Update pigweed to latest master

* Fix matter_yamltests_distribution path after pigweed update

* Regen configs

* Drop `extern "C"` from main functions

* Workaround for NuttX platform linking C++ main as C

* Update pigweed
diff --git a/examples/all-clusters-app/nxp/common/main/main.cpp b/examples/all-clusters-app/nxp/common/main/main.cpp
@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;
 
diff --git a/examples/contact-sensor-app/nxp/common/main.cpp b/examples/contact-sensor-app/nxp/common/main.cpp
@@ -30,7 +30,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();
diff --git a/examples/laundry-washer-app/nxp/common/main/main.cpp b/examples/laundry-washer-app/nxp/common/main/main.cpp
@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;
 
diff --git a/examples/light-switch-app/genio/src/main.cpp b/examples/light-switch-app/genio/src/main.cpp
@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 
diff --git a/examples/lighting-app-data-mode-no-unique-id/linux/main.cpp b/examples/lighting-app-data-mode-no-unique-id/linux/main.cpp
@@ -95,7 +95,7 @@ void ApplicationShutdown()
     }
 }
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     if (ChipLinuxAppInit(argc, argv) != 0)
     {
diff --git a/examples/lighting-app/genio/src/main.cpp b/examples/lighting-app/genio/src/main.cpp
@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 
diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp
@@ -95,7 +95,14 @@ void ApplicationShutdown()
     }
 }
 
-extern "C" int main(int argc, char * argv[])
+#ifdef __NuttX__
+// NuttX requires the main function to be defined with C-linkage. However, marking
+// the main as extern "C" is not strictly conformant with the C++ standard. Since
+// clang >= 20 such code triggers -Wmain warning.
+extern "C" {
+#endif
+
+int main(int argc, char * argv[])
 {
     if (ChipLinuxAppInit(argc, argv) != 0)
     {
@@ -124,3 +131,7 @@ extern "C" int main(int argc, char * argv[])
 
     return 0;
 }
+
+#ifdef __NuttX__
+}
+#endif
diff --git a/examples/lighting-app/nxp/common/main.cpp b/examples/lighting-app/nxp/common/main.cpp
@@ -30,7 +30,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();
diff --git a/examples/lock-app/genio/src/main.cpp b/examples/lock-app/genio/src/main.cpp
@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 
diff --git a/examples/lock-app/nxp/common/main/main.cpp b/examples/lock-app/nxp/common/main/main.cpp
@@ -39,7 +39,7 @@ extern "C" void main_task(void const * argument)
     chip::NXP::App::GetAppTask().Start();
 }
 #else
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     chip::DeviceLayer::PlatformMgrImpl().HardwareInit();
     chip::NXP::App::GetAppTask().Start();
diff --git a/examples/ota-requestor-app/genio/src/main.cpp b/examples/ota-requestor-app/genio/src/main.cpp
@@ -281,7 +281,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 
diff --git a/examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp b/examples/platform/openiotsdk/app/openiotsdk_startup_gcc.cpp
@@ -57,7 +57,7 @@ alignas(8) static uint8_t malloc_mutex_obj[80];
 
 // C runtime import: constructor initialization and main
 extern "C" void __libc_init_array(void);
-extern "C" int main(void);
+int main(void);
 
 // IOT SDK serial declarations
 #define STDIN_FILENO 0
diff --git a/examples/shell/genio/src/main.cpp b/examples/shell/genio/src/main.cpp
@@ -161,7 +161,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 
diff --git a/examples/thermostat/genio/src/main.cpp b/examples/thermostat/genio/src/main.cpp
@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)
  * Main Function
  ****************************************************************************/
 
-extern "C" int main(void)
+int main(void)
 {
     mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
 
diff --git a/examples/thermostat/nxp/common/main/main.cpp b/examples/thermostat/nxp/common/main/main.cpp
@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
 
 using namespace ::chip::DeviceLayer;
 
-extern "C" int main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
     TaskHandle_t taskHandle;
 
diff --git a/scripts/BUILD.gn b/scripts/BUILD.gn
@@ -20,8 +20,8 @@ import("$dir_pw_build/python_dist.gni")
 
 # This target creates a single Python package and wheel for yamltests. It will
 # merge all Python dependencies Matter. The output is located in:
-#   out/obj/matter_yamltests_distribution/  <- source files here
-#   out/obj/matter_yamltests_distribution._build_wheel/matter_yamltests-0.0.1-py3-none-any.whl
+#   out/obj/scripts/matter_yamltests_distribution/  <- source files here
+#   out/obj/scripts/matter_yamltests_distribution._build_wheel/matter_yamltests-0.0.1-py3-none-any.whl
 pw_python_distribution("matter_yamltests_distribution") {
   packages = [ "${chip_root}/scripts/py_matter_yamltests:matter_yamltests" ]
   generate_setup_cfg = {
diff --git a/scripts/build_python.sh b/scripts/build_python.sh
@@ -175,22 +175,6 @@ tracing_options="matter_log_json_payload_hex=true matter_log_json_payload_decode
 
 gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="$tracing_options chip_detail_logging=$chip_detail_logging chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg $chip_case_retry_arg $pregen_dir_arg chip_config_network_layer_ble=$enable_ble chip_enable_ble=$enable_ble chip_crypto=\"boringssl\""
 
-function ninja_target() {
-    # Print the ninja target required to build a gn label.
-    local GN_LABEL="$1"
-    local NINJA_TARGET="$(gn ls "$OUTPUT_ROOT" --as=output "$GN_LABEL")"
-    echo "$NINJA_TARGET"
-}
-
-function wheel_output_dir() {
-    # Print the wheel output directory for a pw_python_package or
-    # pw_python_distribution. The label must end in "._build_wheel".
-    local GN_LABEL="$1"
-    local NINJA_TARGET="$(ninja_target "$GN_LABEL")"
-    local WHEEL_DIR="$OUTPUT_ROOT"/"$(dirname "$NINJA_TARGET")/$(basename -s .stamp "$NINJA_TARGET")"
-    echo "$WHEEL_DIR"
-}
-
 # Compile Python wheels
 ninja -C "$OUTPUT_ROOT" python_wheels
 
@@ -200,6 +184,11 @@ WHEEL=("$OUTPUT_ROOT"/controller/python/chip*.whl)
 # Add the matter_testing_infrastructure wheel
 WHEEL+=("$OUTPUT_ROOT"/python/obj/src/python_testing/matter_testing_infrastructure/chip-testing._build_wheel/chip_testing-*.whl)
 
+if [ "$install_pytest_requirements" = "yes" ]; then
+    # Add the matter_yamltests_distribution wheel
+    WHEEL+=("$OUTPUT_ROOT"/obj/scripts/matter_yamltests_distribution._build_wheel/matter_yamltests-*.whl)
+fi
+
 if [ -n "$extra_packages" ]; then
     WHEEL+=("$extra_packages")
 fi
@@ -221,14 +210,7 @@ if [ -n "$install_virtual_env" ]; then
     "$ENVIRONMENT_ROOT"/bin/python -m pip install --upgrade "${WHEEL[@]}"
 
     if [ "$install_pytest_requirements" = "yes" ]; then
-        YAMLTESTS_GN_LABEL="//scripts:matter_yamltests_distribution._build_wheel"
-        # Add wheels from pw_python_package or pw_python_distribution templates.
-        YAMLTEST_WHEEL=(
-            "$(ls -tr "$(wheel_output_dir "$YAMLTESTS_GN_LABEL")"/*.whl | head -n 1)"
-        )
-
         echo_blue "Installing python test dependencies ..."
-        "$ENVIRONMENT_ROOT"/bin/pip install --upgrade "${YAMLTEST_WHEEL[@]}"
         "$ENVIRONMENT_ROOT"/bin/pip install -r "$CHIP_ROOT/scripts/tests/requirements.txt"
         "$ENVIRONMENT_ROOT"/bin/pip install -r "$CHIP_ROOT/src/python_testing/requirements.txt"
     fi
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
diff --git a/src/lib/address_resolve/tool.cpp b/src/lib/address_resolve/tool.cpp
diff --git a/src/test_driver/nrfconnect/main/runner.cpp b/src/test_driver/nrfconnect/main/runner.cpp
diff --git a/src/tools/chip-cert/chip-cert.cpp b/src/tools/chip-cert/chip-cert.cpp
diff --git a/src/tools/spake2p/spake2p.cpp b/src/tools/spake2p/spake2p.cpp
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
diff --git a/third_party/pigweed/update.sh b/third_party/pigweed/update.sh

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];`
`32`	`32`
`33`	`33`	`using namespace ::chip::DeviceLayer;`
`34`	`34`
`35`		`-extern "C" int main(int argc, char * argv[])`
	`35`	`+int main(int argc, char * argv[])`
`36`	`36`	`{`
`37`	`37`	`TaskHandle_t taskHandle;`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ extern "C" void main_task(void const * argument)`
`30`	`30`	`chip::NXP::App::GetAppTask().Start();`
`31`	`31`	`}`
`32`	`32`	`#else`
`33`		`-extern "C" int main(int argc, char * argv[])`
	`33`	`+int main(int argc, char * argv[])`
`34`	`34`	`{`
`35`	`35`	`chip::DeviceLayer::PlatformMgrImpl().HardwareInit();`
`36`	`36`	`chip::NXP::App::GetAppTask().Start();`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ void vStartTask(void * pvParameters)`
`251`	`251`	`* Main Function`
`252`	`252`	`****************************************************************************/`
`253`	`253`
`254`		`-extern "C" int main(void)`
	`254`	`+int main(void)`
`255`	`255`	`{`
`256`	`256`	`mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);`
`257`	`257`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void ApplicationShutdown()`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`-extern "C" int main(int argc, char * argv[])`
	`98`	`+int main(int argc, char * argv[])`
`99`	`99`	`{`
`100`	`100`	`if (ChipLinuxAppInit(argc, argv) != 0)`
`101`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,14 @@ void ApplicationShutdown()`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`-extern "C" int main(int argc, char * argv[])`
	`98`	`+#ifdef __NuttX__`
	`99`	`+// NuttX requires the main function to be defined with C-linkage. However, marking`
	`100`	`+// the main as extern "C" is not strictly conformant with the C++ standard. Since`
	`101`	`+// clang >= 20 such code triggers -Wmain warning.`
	`102`	`+extern "C" {`
	`103`	`+#endif`
	`104`	`+`
	`105`	`+int main(int argc, char * argv[])`
`99`	`106`	`{`
`100`	`107`	`if (ChipLinuxAppInit(argc, argv) != 0)`
`101`	`108`	`{`
`@@ -124,3 +131,7 @@ extern "C" int main(int argc, char * argv[])`
`124`	`131`
`125`	`132`	`return 0;`
`126`	`133`	`}`
	`134`	`+`
	`135`	`+#ifdef __NuttX__`
	`136`	`+}`
	`137`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ extern "C" void main_task(void const * argument)`
`39`	`39`	`chip::NXP::App::GetAppTask().Start();`
`40`	`40`	`}`
`41`	`41`	`#else`
`42`		`-extern "C" int main(int argc, char * argv[])`
	`42`	`+int main(int argc, char * argv[])`
`43`	`43`	`{`
`44`	`44`	`chip::DeviceLayer::PlatformMgrImpl().HardwareInit();`
`45`	`45`	`chip::NXP::App::GetAppTask().Start();`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ void vStartTask(void * pvParameters)`
`281`	`281`	`* Main Function`
`282`	`282`	`****************************************************************************/`
`283`	`283`
`284`		`-extern "C" int main(void)`
	`284`	`+int main(void)`
`285`	`285`	`{`
`286`	`286`	`mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);`
`287`	`287`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ void vStartTask(void * pvParameters)`
`161`	`161`	`* Main Function`
`162`	`162`	`****************************************************************************/`
`163`	`163`
`164`		`-extern "C" int main(void)`
	`164`	`+int main(void)`
`165`	`165`	`{`
`166`	`166`	`mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);`
`167`	`167`