Energy Gateway commodity tariff example missing Pigweed build dependencies (project-chip#41704)

* Added some PW dependencies to enrg-gtw-app/CTC_server build files

* Removed refs to nonexist files

* The Pigweed inclusion way has changed.

* Added comment

* Fixed fail at building thew esp32 sample

Author: dsavitsky-dsr

examples/energy-gateway-app/esp32/CMakeLists.txt

@@ -60,30 +60,35 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=uninitialized" APPEND)
 
 flashing_script()
 
+# Dependencies required for pw_containers (used by CommodityTariff cluster)
+include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+include($ENV{PW_ROOT}/pw_assert/backend.cmake)
+include($ENV{PW_ROOT}/pw_log/backend.cmake)
+include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
+
+pw_set_backend(pw_log pw_log_basic)
+pw_set_backend(pw_assert.check pw_assert_log.check_backend)
+pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
+pw_set_backend(pw_sys_io pw_sys_io.esp32)
+
+add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
+add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
+add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sync)
+
+# Dependencies required for pw_rpc
 if(CONFIG_ENABLE_PW_RPC)
-  include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
-  include($ENV{PW_ROOT}/pw_assert/backend.cmake)
-  include($ENV{PW_ROOT}/pw_log/backend.cmake)
-  include($ENV{PW_ROOT}/pw_sys_io/backend.cmake)
   include($ENV{PW_ROOT}/pw_trace/backend.cmake)
   include($ENV{PW_ROOT}/pw_interrupt/backend.cmake)
   include($ENV{PW_ROOT}/pw_sync/backend.cmake)
   include($ENV{PW_ROOT}/third_party/freertos/backend.cmake)
 
   pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 
-  pw_set_backend(pw_log pw_log_basic)
-  pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-  pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-  pw_set_backend(pw_sys_io pw_sys_io.esp32)
   pw_set_backend(pw_trace pw_trace_tokenized)
   pw_set_backend(pw_interrupt.context pw_interrupt_freertos.context)
   pw_set_backend(pw_sync.interrupt_spin_lock pw_sync.esp32_interrupt_spin_lock)
   pw_set_backend(pw_sync.mutex pw_sync.esp32)
   pw_set_backend(pw_third_party.freertos idf::freertos)
 
-  add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
   add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-  add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
-  add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sync)
 endif(CONFIG_ENABLE_PW_RPC)

examples/energy-gateway-app/linux/BUILD.gn

@@ -20,10 +20,7 @@ import("${chip_root}/third_party/imgui/imgui.gni")
 
 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")
-}
+import("//build_overrides/pigweed.gni")
 
 config("includes") {
   include_dirs = [
@@ -53,6 +50,7 @@ executable("chip-energy-gateway-app") {
   ]
 
   deps = [
+    "$dir_pw_containers:vector",
     "${chip_root}/examples/energy-gateway-app/energy-gateway-common",
     "${chip_root}/examples/platform/linux:app-main",
     "${chip_root}/src/app:attribute-persistence",

examples/energy-gateway-app/linux/args.gni

@@ -16,6 +16,8 @@
 
 import("//build_overrides/chip.gni")
 
+import("//build_overrides/pigweed.gni")
+
 import("${chip_root}/config/standalone/args.gni")
 
 chip_device_project_config_include = "<CHIPProjectAppConfig.h>"
@@ -33,3 +35,7 @@ chip_enable_commodity_tariff_trigger = true
 chip_enable_electrical_grid_conditions_trigger = true
 chip_enable_meter_identification_trigger = true
 chip_enable_commodity_metering_trigger = true
+
+pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
+
+pw_build_LINK_DEPS = [ "$dir_pw_assert:impl" ]

src/app/clusters/commodity-tariff-server/BUILD.gn

@@ -21,6 +21,9 @@ source_set("commodity-tariff-server") {
     "CommodityTariffConsts.h",
   ]
 
-  public_deps =
-      [ "${chip_root}/zzz_generated/app-common/clusters/CommodityTariff" ]
+  public_deps = [
+    "${chip_root}/third_party/pigweed/repo/pw_containers:algorithm",
+    "${chip_root}/third_party/pigweed/repo/pw_containers:vector",
+    "${chip_root}/zzz_generated/app-common/clusters/CommodityTariff",
+  ]
 }

src/app/clusters/commodity-tariff-server/app_config_dependent_sources.cmake

@@ -13,6 +13,11 @@
 # limitations under the License.
 
 # This is the equivalent to app_config_dependent_sources.gni
+target_link_libraries(${APP_TARGET} PRIVATE
+  pw_containers.algorithm
+  pw_containers.vector
+)
+
 TARGET_SOURCES(
   ${APP_TARGET}
   PRIVATE

src/app/clusters/commodity-tariff-server/tests/BUILD.gn

@@ -19,7 +19,7 @@ import("//build_overrides/pigweed.gni")
 import("${chip_root}/build/chip/chip_test_suite.gni")
 
 chip_test_suite("tests") {
-  output_name = "TestCommodityTariffBaseDataClass"
+  output_name = "libTestCommodityTariffCluster"
 
   test_sources = [ "TestCommodityTariffBaseDataClass.cpp" ]