[Build] ChipTool iOS fails to build (again) (#5910)

project-chip · Apr 9, 2021 · 524bafa · 524bafa
1 parent 1274bcf
commit 524bafa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj
@@ -539,6 +539,7 @@
 					"$(CHIP_ROOT)/src/darwin/Framework/CHIP/",
 					"$(CHIP_ROOT)/src/app/util",
 					"$(CHIP_ROOT)/third_party/nlio/repo/include",
+					"$(TEMP_DIR)/out/gen/include",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -667,6 +668,7 @@
 					"$(CHIP_ROOT)/config/ios",
 					"$(CHIP_ROOT)/third_party/nlassert/repo/include",
 					.,
+					"$(TEMP_DIR)/out/gen/include",
 				);
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/src/platform/Darwin/ConfigurationManagerImpl.cpp b/src/platform/Darwin/ConfigurationManagerImpl.cpp
@@ -33,18 +33,22 @@
 #include <support/CodeUtils.h>
 #include <support/logging/CHIPLogging.h>
 
+#include <TargetConditionals.h>
+#if TARGET_OS_OSX
 #include <CoreFoundation/CoreFoundation.h>
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/network/IOEthernetController.h>
 #include <IOKit/network/IOEthernetInterface.h>
 #include <IOKit/network/IONetworkInterface.h>
+#endif // TARGET_OS_OSX
 
 namespace chip {
 namespace DeviceLayer {
 
 using namespace ::chip::DeviceLayer::Internal;
 
+#if TARGET_OS_OSX
 CHIP_ERROR FindInterfaces(io_iterator_t * primaryInterfaceIterator)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -122,6 +126,7 @@ CHIP_ERROR GetMACAddressFromInterfaces(io_iterator_t primaryInterfaceIterator, u
 
     return err;
 }
+#endif // TARGET_OS_OSX
 
 /** Singleton instance of the ConfigurationManager implementation object.
  */
@@ -141,6 +146,7 @@ CHIP_ERROR ConfigurationManagerImpl::_Init()
 
 CHIP_ERROR ConfigurationManagerImpl::_GetPrimaryWiFiMACAddress(uint8_t * buf)
 {
+#if TARGET_OS_OSX
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     io_iterator_t primaryInterfaceIterator;
@@ -151,6 +157,9 @@ CHIP_ERROR ConfigurationManagerImpl::_GetPrimaryWiFiMACAddress(uint8_t * buf)
     IOObjectRelease(primaryInterfaceIterator);
 
     return err;
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif // TARGET_OS_OSX
 }
 
 bool ConfigurationManagerImpl::_CanFactoryReset()