From 54c0faa01754aaad355cafd40aed3c5aff5fc8c2 Mon Sep 17 00:00:00 2001
From: bhmanda <bhmanda@silabs.com>
Date: Thu, 29 Aug 2024 22:31:02 +0530
Subject: [PATCH] Moved wifi include to common efr32_sdk.gni

---
 examples/light-switch-app/silabs/BUILD.gn | 1 -
 examples/lighting-app/silabs/BUILD.gn     | 1 -
 examples/lock-app/silabs/BUILD.gn         | 1 -
 examples/platform/silabs/SiWx917/BUILD.gn | 7 +++----
 examples/thermostat/silabs/BUILD.gn       | 1 -
 examples/window-app/silabs/BUILD.gn       | 1 -
 third_party/silabs/efr32_sdk.gni          | 3 +++
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/examples/light-switch-app/silabs/BUILD.gn b/examples/light-switch-app/silabs/BUILD.gn
index 150068d0cb0495..2602842edf4d83 100644
--- a/examples/light-switch-app/silabs/BUILD.gn
+++ b/examples/light-switch-app/silabs/BUILD.gn
@@ -81,7 +81,6 @@ if (wifi_soc) {
 
     include_dirs = [
       "${chip_root}/src/platform/silabs/efr32",
-      "${chip_root}/src/platform/silabs/wifi",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
       "${chip_root}/src/lib",
diff --git a/examples/lighting-app/silabs/BUILD.gn b/examples/lighting-app/silabs/BUILD.gn
index 7bb686c53dd8af..55d7d4100946f2 100644
--- a/examples/lighting-app/silabs/BUILD.gn
+++ b/examples/lighting-app/silabs/BUILD.gn
@@ -97,7 +97,6 @@ if (wifi_soc) {
 
     include_dirs = [
       "${chip_root}/src/platform/silabs/efr32",
-      "${chip_root}/src/platform/silabs/wifi",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
       "${chip_root}/src/lib",
diff --git a/examples/lock-app/silabs/BUILD.gn b/examples/lock-app/silabs/BUILD.gn
index 561cb5afa513c5..a20a4ad66fedc7 100644
--- a/examples/lock-app/silabs/BUILD.gn
+++ b/examples/lock-app/silabs/BUILD.gn
@@ -81,7 +81,6 @@ if (wifi_soc) {
 
     include_dirs = [
       "${chip_root}/src/platform/silabs/efr32",
-      "${chip_root}/src/platform/silabs/wifi",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
       "${chip_root}/src/lib",
diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index 5d264d9c97ee15..6ead7f31154b09 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -50,8 +50,7 @@ declare_args() {
 
 # Sanity check
 assert(chip_enable_wifi)
-
-silabs_plat_si91x_dir = "${chip_root}/src/platform/silabs"
+silabs_plat_dir = "${chip_root}/src/platform/silabs"
 silabs_plat_si91x_wifi_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
 
 import("${silabs_common_plat_dir}/args.gni")
@@ -183,7 +182,7 @@ source_set("siwx917-common") {
   include_dirs = [
     ".",
     "SiWx917/",
-    "${silabs_plat_si91x_dir}/wifi",
+    "${silabs_plat_dir}/wifi",
     "${silabs_plat_si91x_wifi_dir}",
   ]
 
@@ -197,7 +196,7 @@ source_set("siwx917-common") {
     "${silabs_common_plat_dir}/syscalls_stubs.cpp",
     "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
     "${silabs_common_plat_dir}/wifi/wfx_rsi_host.cpp",
-    "${silabs_plat_si91x_dir}/wifi/dhcp_client.cpp",
+    "${silabs_plat_dir}/wifi/dhcp_client.cpp",
     "${silabs_plat_si91x_wifi_dir}/ethernetif.cpp",
     "${silabs_plat_si91x_wifi_dir}/lwip_netif.cpp",
     "SiWx917/sl_wifi_if.cpp",
diff --git a/examples/thermostat/silabs/BUILD.gn b/examples/thermostat/silabs/BUILD.gn
index 16c12077dc4ed7..75b2f75c15c863 100644
--- a/examples/thermostat/silabs/BUILD.gn
+++ b/examples/thermostat/silabs/BUILD.gn
@@ -85,7 +85,6 @@ if (wifi_soc) {
 
     include_dirs = [
       "${chip_root}/src/platform/silabs/efr32",
-      "${chip_root}/src/platform/silabs/wifi",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
       "${chip_root}/src/lib",
diff --git a/examples/window-app/silabs/BUILD.gn b/examples/window-app/silabs/BUILD.gn
index 4c425f4e2156dd..c45dbda632a5f9 100644
--- a/examples/window-app/silabs/BUILD.gn
+++ b/examples/window-app/silabs/BUILD.gn
@@ -82,7 +82,6 @@ if (wifi_soc) {
 
     include_dirs = [
       "${chip_root}/src/platform/silabs/efr32",
-      "${chip_root}/src/platform/silabs/wifi",
       "${silabs_project_dir}/include",
       "${examples_plat_dir}",
       "${chip_root}/src/lib",
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index c75f67694e8d5c..1cd69d31e7084b 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -362,6 +362,9 @@ template("efr32_sdk") {
     if (use_rs9116 || use_SiWx917) {
       _include_dirs += [ "${chip_root}/src/platform/silabs/rs911x" ]
     }
+    if (use_wf200 || use_rs9116 || use_SiWx917) {
+      _include_dirs += [ "${chip_root}/src/platform/silabs/wifi" ]
+    }
     if (silabs_family != "mgm24") {
       _include_dirs += [
         "${efr32_sdk_root}/platform/radio/rail_lib/hal",