Add chip_external_mbedtls flag to src/crypto (#23538)

This allows mbedtls to be compiled outside of the Matter gn build routine, for build targets that wish to share mbedtls symbols.
project-chip · Nov 15, 2023 · 6bd8a97 · 6bd8a97
1 parent 10b4732
commit 6bd8a97
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/config/nrfconnect/chip-gn/args.gni b/config/nrfconnect/chip-gn/args.gni
@@ -14,6 +14,8 @@
 
 import("//build_overrides/chip.gni")
 
+import("${chip_root}/src/crypto/crypto.gni")
+
 chip_device_platform = "nrfconnect"
 
 chip_build_tests = false
@@ -22,6 +24,9 @@ chip_project_config_include = ""
 chip_system_project_config_include = ""
 chip_ble_project_config_include = ""
 
+chip_crypto = "mbedtls"
+chip_external_mbedtls = true
+
 custom_toolchain = "${chip_root}/config/nrfconnect/chip-gn/toolchain:zephyr"
 
 pw_build_PIP_CONSTRAINTS = [ "${chip_root}/scripts/constraints.txt" ]
diff --git a/config/telink/chip-gn/args.gni b/config/telink/chip-gn/args.gni
@@ -14,6 +14,8 @@
 
 import("//build_overrides/chip.gni")
 
+import("${chip_root}/src/crypto/crypto.gni")
+
 chip_device_platform = "telink"
 
 chip_build_tests = false
@@ -22,6 +24,9 @@ chip_project_config_include = ""
 chip_system_project_config_include = ""
 chip_ble_project_config_include = ""
 
+chip_crypto = "mbedtls"
+chip_external_mbedtls = true
+
 custom_toolchain = "${chip_root}/config/telink/chip-gn/toolchain:zephyr"
 
 pw_build_PIP_CONSTRAINTS = [ "${chip_root}/scripts/constraints.txt" ]
diff --git a/config/zephyr/chip-gn/args.gni b/config/zephyr/chip-gn/args.gni
@@ -14,6 +14,8 @@
 
 import("//build_overrides/chip.gni")
 
+import("${chip_root}/src/crypto/crypto.gni")
+
 chip_device_platform = "zephyr"
 
 chip_build_tests = false
@@ -22,6 +24,9 @@ chip_project_config_include = ""
 chip_system_project_config_include = ""
 chip_ble_project_config_include = ""
 
+chip_crypto = "mbedtls"
+chip_external_mbedtls = true
+
 custom_toolchain = "${chip_root}/config/zephyr/chip-gn/toolchain:zephyr"
 
 pw_build_PIP_CONSTRAINTS = [ "${chip_root}/scripts/constraints.txt" ]
diff --git a/src/crypto/BUILD.gn b/src/crypto/BUILD.gn
@@ -107,9 +107,7 @@ if (chip_crypto == "openssl") {
     sources = [ "CHIPCryptoPALmbedTLS.cpp" ]
     public_deps = [ ":public_headers" ]
 
-    external_mbedtls = current_os == "zephyr"
-
-    if (!external_mbedtls) {
+    if (!chip_external_mbedtls) {
       public_deps += [ "${mbedtls_root}:mbedtls" ]
     }
   }

diff --git a/src/crypto/crypto.gni b/src/crypto/crypto.gni
@@ -16,4 +16,10 @@ declare_args() {
   # Crypto implementation: mbedtls, openssl, tinycrypt, boringssl, platform.
   chip_crypto = ""
   chip_with_se05x = 0
+
+  # Compile mbedtls externally. Only used if chip_crypto == "mbedtls"
+  chip_external_mbedtls = false
 }
+
+assert(!chip_external_mbedtls || chip_crypto == "mbedtls",
+       "Use of external mbedtls requires the mbedtls crypto impl")