From 94fecb070e6d15d3f7fa7cbdea24255070b01232 Mon Sep 17 00:00:00 2001 From: Junior Martinez Date: Tue, 16 Jan 2024 16:14:47 +0000 Subject: [PATCH] Pull request #1492: Add a condition in the build script to 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 <67972863+jmartinez-silabs@users.noreply.github.com> 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 --- scripts/examples/gn_silabs_example.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh index 9f7314c14010ad..47509e95b8bf1d 100755 --- 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 @@ -166,6 +167,7 @@ else shift shift + otLibArgs="" while [ $# -gt 0 ]; do case $1 in --clean) @@ -209,11 +211,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) @@ -299,6 +303,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 '*')