From 76bc62383c7acf17e1ce03953f64a67d0d2b1a64 Mon Sep 17 00:00:00 2001
From: Shrinivas Gutte <Shrinivas.Gutte@silabs.com>
Date: Fri, 9 Dec 2022 23:52:42 +0000
Subject: [PATCH] Pull request #410: Added fixes for 917 SOC build errors for
 light-switch-app, lock-app, windows-app

Merge in WMN_TOOLS/matter from bugfix/917_SOC_build_issue_fix to RC_1.0.2-1.0

Squashed commit of the following:

commit 349bf44f7f0e49a77530775141a354c4bdf99533
Author: shgutte <shgutte@silabs.com>
Date:   Fri Dec 9 13:02:11 2022 +0530

    Removed unwanted changes

commit 2e5bdb69475ff4f5b9136bf814661b77ed251017
Author: shgutte <shgutte@silabs.com>
Date:   Fri Dec 9 12:00:02 2022 +0530

    Adds fix for the light-switch-app

commit b04cbbbb2e94c900cf494afed4b90f9c2dbb573b
Author: shgutte <shgutte@silabs.com>
Date:   Fri Dec 9 11:03:00 2022 +0530

    Added fix for 917 SOC build error fix for lock-app, windows-app
---
 examples/light-switch-app/silabs/SiWx917/BUILD.gn | 2 ++
 examples/lighting-app/silabs/SiWx917/BUILD.gn     | 1 -
 third_party/silabs/SiWx917_sdk.gni                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/light-switch-app/silabs/SiWx917/BUILD.gn b/examples/light-switch-app/silabs/SiWx917/BUILD.gn
index 11aebc2b8d6f36..9bd751d570e496 100644
--- a/examples/light-switch-app/silabs/SiWx917/BUILD.gn
+++ b/examples/light-switch-app/silabs/SiWx917/BUILD.gn
@@ -96,6 +96,8 @@ if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
   disable_lcd = true
 }
 
+defines = []
+
 # WiFi settings
 if (chip_enable_wifi) {
   wifi_sdk_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
diff --git a/examples/lighting-app/silabs/SiWx917/BUILD.gn b/examples/lighting-app/silabs/SiWx917/BUILD.gn
index ecf1b36ae72e91..a2894afeb93b9e 100644
--- a/examples/lighting-app/silabs/SiWx917/BUILD.gn
+++ b/examples/lighting-app/silabs/SiWx917/BUILD.gn
@@ -156,7 +156,6 @@ efr32_sdk("sdk") {
 
   include_dirs = [
     "${chip_root}/src/platform/silabs/SiWx917",
-    "${chip_root}/third_party/mbedtls/repo/library",
     "${efr32_project_dir}/include",
     "${examples_plat_dir}",
     "${chip_root}/src/lib",
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
index 41319cecac81a5..283c81faef2854 100644
--- a/third_party/silabs/SiWx917_sdk.gni
+++ b/third_party/silabs/SiWx917_sdk.gni
@@ -118,6 +118,7 @@ template("efr32_sdk") {
       "${sdk_support_root}/matter/mbedtls/tinycrypt/inc",
       "${sdk_support_root}/matter/mbedtls/tinycrypt/src",
       "${chip_root}/third_party/mbedtls/repo/include",
+      "${chip_root}/third_party/mbedtls/repo/library",
 
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/config",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen",