From 6ed0fc449e4986e671daa100ae59f01ad9f304ae Mon Sep 17 00:00:00 2001 From: Pankaj Garg Date: Fri, 21 Aug 2020 12:27:20 -0700 Subject: [PATCH] Fix building of iOS CHIPTool app (#2278) * Fix building of iOS CHIPTool app * Ignore preprocessor directive in connector script --- .../Framework/CHIP.xcodeproj/project.pbxproj | 32 ++++++++++++------- .../Framework/chip_xcode_build_connector.sh | 3 ++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj index 921a4ff7eceb3f..71e253d739ec10 100644 --- 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 index 538ee336e1538c..ea9c4515a0982c 100755 --- 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