Fix building of iOS CHIPTool app (project-chip#2278)

* Fix building of iOS CHIPTool app * Ignore preprocessor directive in connector script
bhaskar-apple · Aug 21, 2020 · 6ed0fc4 · 6ed0fc4
1 parent 106c86c
commit 6ed0fc4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
@@ -451,9 +451,10 @@
 					"CHIP_LOGGING_STYLE_EXTERNAL=1",
 					"CHIP_DEVICE_LAYER_TARGET=Darwin",
 					"CHIP_DEVICE_LAYER_TARGET_DARWIN=1",
-                                        "CHIP_DEVICE_LAYER_TARGET_LINUX=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_NRF5=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					"CHIP_DEVICE_LAYER_TARGET_LINUX=0",
+					"CHIP_DEVICE_LAYER_TARGET_NRF5=0",
+					"CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					CHIP_CRYPTO_MBEDTLS,
 					"CHIP_SYSTEM_CONFIG_USE_SOCKETS=1",
 					"$(inherited)",
 				);
@@ -463,6 +464,7 @@
 					"$(CHIP_ROOT)/src/lib",
 					"$(CHIP_ROOT)/config/standalone",
 					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
+					"$(CHIP_ROOT)/third_party/mbedtls/repo/include",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -508,9 +510,10 @@
 					"CHIP_LOGGING_STYLE_EXTERNAL=1",
 					"CHIP_DEVICE_LAYER_TARGET=Darwin",
 					"CHIP_DEVICE_LAYER_TARGET_DARWIN=1",
-                                        "CHIP_DEVICE_LAYER_TARGET_LINUX=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_NRF5=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					"CHIP_DEVICE_LAYER_TARGET_LINUX=0",
+					"CHIP_DEVICE_LAYER_TARGET_NRF5=0",
+					"CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					CHIP_CRYPTO_MBEDTLS,
 					"CHIP_SYSTEM_CONFIG_USE_SOCKETS=1",
 					"$(inherited)",
 				);
@@ -521,6 +524,7 @@
 					"$(CHIP_ROOT)/src/app",
 					"$(CHIP_ROOT)/config/standalone",
 					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
+					"$(CHIP_ROOT)/third_party/mbedtls/repo/include",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -662,9 +666,10 @@
 					"CHIP_LOGGING_STYLE_EXTERNAL=1",
 					"CHIP_DEVICE_LAYER_TARGET=Darwin",
 					"CHIP_DEVICE_LAYER_TARGET_DARWIN=1",
-                                        "CHIP_DEVICE_LAYER_TARGET_LINUX=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_NRF5=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					"CHIP_DEVICE_LAYER_TARGET_LINUX=0",
+					"CHIP_DEVICE_LAYER_TARGET_NRF5=0",
+					"CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					CHIP_CRYPTO_MBEDTLS,
 					"CHIP_SYSTEM_CONFIG_USE_SOCKETS=1",
 					"$(inherited)",
 				);
@@ -675,6 +680,7 @@
 					"$(CHIP_ROOT)/src/app",
 					"$(CHIP_ROOT)/config/ios",
 					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
+					"$(CHIP_ROOT)/third_party/mbedtls/repo/include",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -797,9 +803,10 @@
 					"CHIP_LOGGING_STYLE_EXTERNAL=1",
 					"CHIP_DEVICE_LAYER_TARGET=Darwin",
 					"CHIP_DEVICE_LAYER_TARGET_DARWIN=1",
-                                        "CHIP_DEVICE_LAYER_TARGET_LINUX=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_NRF5=0",
-                                        "CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					"CHIP_DEVICE_LAYER_TARGET_LINUX=0",
+					"CHIP_DEVICE_LAYER_TARGET_NRF5=0",
+					"CHIP_DEVICE_LAYER_TARGET_EFR32=0",
+					CHIP_CRYPTO_MBEDTLS,
 					"CHIP_SYSTEM_CONFIG_USE_SOCKETS=1",
 					"$(inherited)",
 				);
@@ -810,6 +817,7 @@
 					"$(CHIP_ROOT)/src/app",
 					"$(CHIP_ROOT)/config/ios",
 					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
+					"$(CHIP_ROOT)/third_party/mbedtls/repo/include",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/src/darwin/Framework/chip_xcode_build_connector.sh b/src/darwin/Framework/chip_xcode_build_connector.sh
@@ -62,6 +62,9 @@ for define in "${DEFINES[@]}"; do
         CONFIG_NETWORK_LAYER*)
             continue
             ;;
+        CHIP_CRYPTO_*)
+            continue
+            ;;
     esac
     target_defines+=,\"${define//\"/\\\"}\"
 done