Fix gn conditional inclusions

mkardous-silabs · Sep 19, 2024 · 2f17224 · 2f17224
1 parent 1f3b31e
commit 2f17224
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -40,9 +40,6 @@ declare_args() {
   #default Wifi Password
   chip_default_wifi_psk = ""
 
-  # Enable TestEventTrigger in GeneralDiagnostics cluster
-  sl_enable_test_event_trigger = false
-
   # The EnableKey in hex string format used by TestEventTrigger command in
   # GeneralDiagnostics cluster. The length of the string should be 16 bytes.
   sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"

diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
@@ -40,9 +40,6 @@ declare_args() {
   #default Wifi Password
   chip_default_wifi_psk = ""
 
-  # Enable TestEventTrigger in GeneralDiagnostics cluster
-  sl_enable_test_event_trigger = false
-
   # The EnableKey in hex string format used by TestEventTrigger command in
   # GeneralDiagnostics cluster. The length of the string should be 16 bytes.
   sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"

diff --git a/examples/platform/silabs/provision/BUILD.gn b/examples/platform/silabs/provision/BUILD.gn
@@ -51,7 +51,9 @@ source_set("storage") {
   public_deps =
       [ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
 
-  public_configs = [
-    "${chip_root}/examples/platform/silabs/efr32:test-event-trigger-config",
-  ]
+  if (sl_enable_test_event_trigger) {
+    public_configs = [
+      "${chip_root}/examples/platform/silabs/efr32:test-event-trigger-config",
+    ]
+  }
 }
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -86,6 +86,9 @@ declare_args() {
 
   # Factory Provision storage
   use_provision_flash_storage = wifi_soc
+
+  # Enable TestEventTrigger in GeneralDiagnostics cluster
+  sl_enable_test_event_trigger = false
 }
 
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"