From ca69ea435acd2ea4d0ebdcdcde6e0d75ae0157c7 Mon Sep 17 00:00:00 2001 From: Andy Street Date: Wed, 16 Nov 2016 04:32:40 -0800 Subject: [PATCH] Update objc build to use CSSLayout in ReactCommon Summary: Updates objc version to use the same CSSLayout files as the android version Reviewed By: emilsjolander Differential Revision: D4182821 fbshipit-source-id: 81f18184b539fe0ef76ea868bc067b8283c2cccb --- React/React.xcodeproj/project.pbxproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 323aaa8140c..c55468638d0 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -227,7 +227,6 @@ 006FC4131D9B20820057AAAD /* RCTMultipartDataTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultipartDataTask.m; sourceTree = ""; }; 008341F41D1DB34400876D9A /* RCTJSStackFrame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSStackFrame.m; sourceTree = ""; }; 008341F51D1DB34400876D9A /* RCTJSStackFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSStackFrame.h; sourceTree = ""; }; - 131541CF1D3E4893006A0E08 /* CSSLayout-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CSSLayout-internal.h"; sourceTree = ""; }; 131B6AF01AF1093D00FFC3E0 /* RCTSegmentedControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSegmentedControl.h; sourceTree = ""; }; 131B6AF11AF1093D00FFC3E0 /* RCTSegmentedControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSegmentedControl.m; sourceTree = ""; }; 131B6AF21AF1093D00FFC3E0 /* RCTSegmentedControlManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSegmentedControlManager.h; sourceTree = ""; }; @@ -465,14 +464,14 @@ 133683431D37ACA10077D0C3 /* CSSLayout */ = { isa = PBXGroup; children = ( - 131541CF1D3E4893006A0E08 /* CSSLayout-internal.h */, 1321C8CE1D3EB50800D58318 /* CSSNodeList.c */, 1321C8CF1D3EB50800D58318 /* CSSNodeList.h */, 133683441D37ACA10077D0C3 /* CSSLayout.c */, 133683451D37ACA10077D0C3 /* CSSLayout.h */, 133683481D37ACA10077D0C3 /* CSSMacros.h */, ); - path = CSSLayout; + name = CSSLayout; + path = ../ReactCommon/CSSLayout/CSSLayout; sourceTree = ""; }; 134FCB381A6E7F0800051CC8 /* Executors */ = {