[OIS] Add Open IoT SDK platform to common GN build settings

Propagate Open IoT SDK platform settings in build system of Matter components. Signed-off-by: ATmobica <[email protected]>
project-chip · Nov 18, 2022 · 2249713 · 2249713
1 parent ca2f463
commit 2249713
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/build/chip/tools.gni b/build/chip/tools.gni
@@ -23,5 +23,5 @@ declare_args() {
       (chip_crypto == "" &&
        (current_os != "android" && current_os != "freertos" &&
         current_os != "zephyr" && current_os != "mbed" &&
-        current_os != "webos"))
+        current_os != "webos" && current_os != "cmsis-rtos"))
 }
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
@@ -225,7 +225,8 @@ config("warnings_common") {
   }
 
   if (current_os != "mac" && current_os != "ios" && current_os != "linux" &&
-      current_os != "win" && current_os != "tizen" && current_os != "webos") {
+      current_os != "win" && current_os != "tizen" && current_os != "webos" &&
+      current_os != "cmsis-rtos") {
     cflags += [ "-Wstack-usage=8192" ]
   }
 }

diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
@@ -20,8 +20,8 @@ declare_args() {
   optimize_for_size = true
 
   # Optimize debug builds with -Og.
-  optimize_debug =
-      current_os == "freertos" || current_os == "zephyr" || current_os == "mbed"
+  optimize_debug = current_os == "freertos" || current_os == "zephyr" ||
+                   current_os == "mbed" || current_os == "cmsis-rtos"
 
   # Optimization level for debug. Only has an effect if optimize_debug is true.
   optimize_debug_level = "g"

diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn
@@ -62,6 +62,7 @@ static_library("credentials") {
   # For mbed and nrfconnect test builds, which are bilding monolithic test library these files are not needed.
   import("${chip_root}/build/chip/tests.gni")
   if (!(chip_build_tests && (chip_device_platform == "mbed" ||
+                             chip_device_platform == "openiotsdk" ||
                              chip_device_platform == "nrfconnect"))) {
     sources += [
       "tests/CHIPAttCert_test_vectors.cpp",
@@ -70,7 +71,7 @@ static_library("credentials") {
   }
 
   if (chip_device_platform == "esp32" || chip_device_platform == "nrfconnect" ||
-      chip_device_platform == "efr32") {
+      chip_device_platform == "efr32" || chip_device_platform == "openiotsdk") {
     defines = [ "CURRENT_TIME_NOT_IMPLEMENTED=1" ]
   }
 
@@ -98,7 +99,7 @@ static_library("default_attestation_verifier") {
   ]
 
   if (chip_device_platform == "esp32" || chip_device_platform == "nrfconnect" ||
-      chip_device_platform == "efr32") {
+      chip_device_platform == "efr32" || chip_device_platform == "openiotsdk") {
     defines = [ "CURRENT_TIME_NOT_IMPLEMENTED=1" ]
   }
 

diff --git a/src/crypto/BUILD.gn b/src/crypto/BUILD.gn
@@ -22,7 +22,8 @@ import("crypto.gni")
 
 if (chip_crypto == "") {
   if (current_os == "android" || current_os == "freertos" ||
-      current_os == "zephyr" || current_os == "mbed" || current_os == "webos") {
+      current_os == "zephyr" || current_os == "mbed" || current_os == "webos" ||
+      current_os == "cmsis-rtos") {
     chip_crypto = "mbedtls"
   } else {
     chip_crypto = "openssl"
@@ -107,7 +108,7 @@ if (chip_crypto == "openssl") {
     sources = [ "CHIPCryptoPALmbedTLS.cpp" ]
     public_deps = [ ":public_headers" ]
 
-    external_mbedtls = current_os == "zephyr"
+    external_mbedtls = current_os == "zephyr" || current_os == "cmsis-rtos"
 
     if (!external_mbedtls) {
       public_deps += [ "${mbedtls_root}:mbedtls" ]

diff --git a/src/crypto/tests/BUILD.gn b/src/crypto/tests/BUILD.gn
@@ -49,7 +49,7 @@ chip_test_suite("tests") {
   ]
 
   if (chip_device_platform == "esp32" || chip_device_platform == "nrfconnect" ||
-      chip_device_platform == "efr32") {
+      chip_device_platform == "efr32" || chip_device_platform == "openiotsdk") {
     defines = [ "CURRENT_TIME_NOT_IMPLEMENTED=1" ]
   }
 

diff --git a/src/lib/core/core.gni b/src/lib/core/core.gni
@@ -87,7 +87,7 @@ declare_args() {
 
 if (chip_target_style == "") {
   if (current_os != "freertos" && current_os != "zephyr" &&
-      current_os != "mbed") {
+      current_os != "mbed" && current_os != "cmsis-rtos") {
     chip_target_style = "unix"
   } else {
     chip_target_style = "embedded"