[Silabs] Window-app refactor

examples/platform/silabs/SiWx917/BUILD.gn

@@ -247,16 +247,13 @@ source_set("siwx917-common") {
  "${wifi_sdk_dir}/ethernetif.cpp",
  "${wifi_sdk_dir}/lwip_netif.cpp",
  "${wifi_sdk_dir}/wfx_notify.cpp",
+ "BaseApplication.cpp",
  "SiWx917/rsi_if.c",
  "SiWx917/wfx_rsi_host.c",
  "init_ccpPlatform.cpp",
  "matter_config.cpp",
  ]
 
- if (use_base_app) {
- sources += [ "BaseApplication.cpp" ]
- }
-
  if (chip_enable_pw_rpc || chip_build_libshell) {
  sources += [ "uart.cpp" ]
  }

examples/platform/silabs/args.gni

@@ -22,5 +22,4 @@ chip_system_project_config_include = "<CHIPProjectConfig.h>"
 
 declare_args() {
  app_data_model = ""
- use_base_app = true
 }

examples/platform/silabs/efr32/BUILD.gn

@@ -284,14 +284,11 @@ source_set("efr32-common") {
  "${silabs_common_plat_dir}/heap_4_silabs.c",
  "${silabs_common_plat_dir}/silabs_utils.cpp",
  "${silabs_common_plat_dir}/syscalls_stubs.cpp",
+ "BaseApplication.cpp",
  "init_efrPlatform.cpp",
  "matter_config.cpp",
  ]
 
- if (use_base_app) {
- sources += [ "BaseApplication.cpp" ]
- }
-
  if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli) {
  sources += [ "uart.cpp" ]
  }

examples/window-app/silabs/BUILD.gn

@@ -18,9 +18,17 @@ import("//build_overrides/efr32_sdk.gni")
 import("//build_overrides/pigweed.gni")
 
 import("${build_root}/config/defaults.gni")
+import("${efr32_sdk_build_root}/silabs_executable.gni")
+
+import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
-import("${efr32_sdk_build_root}/silabs_executable.gni")
+
+if (chip_enable_pw_rpc) {
+ import("//build_overrides/pigweed.gni")
+ import("$dir_pw_build/target_types.gni")
+}
+
 assert(current_os == "freertos")
 
 project_dir = "${chip_root}/examples/window-app"
@@ -106,10 +114,10 @@ silabs_executable("window_app") {
  defines = []
 
  sources = [
- "${project_dir}/common/src/WindowApp.cpp",
- "${project_dir}/common/src/ZclCallbacks.cpp",
- "src/WindowAppImpl.cpp",
- "src/main.cpp",
+ "${examples_common_plat_dir}/main.cpp",
+ "src/AppTask.cpp",
+ "src/WindowManager.cpp",
+ "src/ZclCallbacks.cpp",
  ]
 
  if (!disable_lcd) {