Pull request project-chip#1492: Add a condition in the build script t…

…o avoid OT-libs build args in wifi builds. Merge in WMN_TOOLS/matter from ot-lib_release to RC_2.3.0-1.3 Squashed commit of the following: commit 775ab02ce0b85fb5fd558ec68cac8e2b9ba30559 Author: Junior Martinez <[email protected]> Date: Mon Jan 15 10:08:41 2024 -0500 Add a condition in the build script to avoid OT-libs build args in wifi builds. Re-add --use_ot_lib in Pipeline for the 4187C release build
rcasallas-silabs · Feb 1, 2024 · 4699a8f · 4699a8f
1 parent 4d540f5
commit 4699a8f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/scripts/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh
@@ -34,6 +34,7 @@ USE_WIFI=false
 USE_DOCKER=false
 USE_GIT_SHA_FOR_VERSION=true
 USE_SLC=false
+USE_OT_LIB=false
 GN_PATH=gn
 GN_PATH_PROVIDED=false
 USE_BOOTLOADER=false
@@ -162,6 +163,7 @@ else
 
     shift
     shift
+    otLibArgs=""
     while [ $# -gt 0 ]; do
         case $1 in
             --clean)
@@ -205,11 +207,13 @@ else
                 shift
                 ;;
             --use_ot_lib)
-                optArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" "
+                USE_OT_LIB=true
+                otLibArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" "
                 shift
                 ;;
             --use_ot_coap_lib)
-                optArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" use_thread_coap_lib=true "
+                USE_OT_LIB=true
+                otLibArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" use_thread_coap_lib=true "
                 shift
                 ;;
             --use_chip_lwip_lib)
@@ -295,6 +299,10 @@ else
         optArgs+="chip_device_platform =\"SiWx917\" is_debug=false "
     fi
 
+    if [ "$USE_OT_LIB" == true ] && [ "$USE_WIFI" == false ]; then
+        optArgs+="$otLibArgs"
+    fi
+
     if [ "$USE_GIT_SHA_FOR_VERSION" == true ]; then
         {
             ShortCommitSha=$(git describe --always --dirty --exclude '*')

diff --git a/silabs_ci_scripts/pipeline/boards.json b/silabs_ci_scripts/pipeline/boards.json
@@ -120,7 +120,7 @@
                         },
                         {
                             "name": "release",
-                            "compilationFlags": "--release"
+                            "compilationFlags": "--release --use_ot_lib"
                         }
                         ],
                     "isSQA": true