From 09277f79a9b7d18b93f6b660e3ba8ad3a5125777 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 21 Nov 2016 09:02:09 -0800 Subject: [PATCH] Fix CSSLayout import hack, update podspec Summary: Correct header import paths, update podspec so we point at the copy in ReactCommon (and can eventually remove the copy under React) Reviewed By: astreet Differential Revision: D4204501 fbshipit-source-id: e979a010092f025b2cdc289e1e5f22fc7b65a8d1 --- RCTCameraRoll.xcodeproj/project.pbxproj | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/RCTCameraRoll.xcodeproj/project.pbxproj b/RCTCameraRoll.xcodeproj/project.pbxproj index 61567ebd6..042908f2f 100644 --- a/RCTCameraRoll.xcodeproj/project.pbxproj +++ b/RCTCameraRoll.xcodeproj/project.pbxproj @@ -174,10 +174,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../React/**", + "$(SRCROOT)/../../ReactCommon/**", + ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Image"; WARNING_CFLAGS = ( "-Werror", "-Wall", @@ -214,9 +219,14 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../React/**", + "$(SRCROOT)/../../ReactCommon/**", + ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Image"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = ( "-Werror", @@ -229,13 +239,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_STATIC_ANALYZER_MODE = deep; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../Image/**", - "$(SRCROOT)/../Network/**", - ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/UIExplorer-gjaibsjtheitasdxdtcvxxqavkvy/Build/Products/Debug-iphoneos", @@ -251,13 +254,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_STATIC_ANALYZER_MODE = deep; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../Image/**", - "$(SRCROOT)/../Network/**", - ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/UIExplorer-gjaibsjtheitasdxdtcvxxqavkvy/Build/Products/Debug-iphoneos",