Skip to content

Commit 3002c4e

Browse files
douglowderfacebook-github-bot
douglowder
authored and
facebook-github-bot
committedMar 12, 2018
Fix tvOS react-native init release build (#18288)
Summary: Add correct dependencies and linker flags to the HelloWorld template Xcode project so that HelloWorld-tvOSTests builds correctly for release builds. Fixes #18288 . Tested with `react-native init --version=https://github.com/dlowder-salesforce/react-native#tvos-init-release-fix` . [IOS][BUGFIX][ local-cli/templates/ios/HelloWorld ]- fix release build for tvOS Closes #18337 Differential Revision: D7240376 Pulled By: hramos fbshipit-source-id: a4ad219e7d6b06bd6928d55ed7398f8fc9352e72
1 parent 84affbd commit 3002c4e

File tree

1 file changed

+133
-3
lines changed

1 file changed

+133
-3
lines changed
 

‎local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj

+133-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
3535
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
3636
2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
37+
2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
3738
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3839
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
3940
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@@ -131,6 +132,62 @@
131132
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
132133
remoteInfo = "fishhook-tvOS";
133134
};
135+
2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */ = {
136+
isa = PBXContainerItemProxy;
137+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
138+
proxyType = 2;
139+
remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
140+
remoteInfo = jsinspector;
141+
};
142+
2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */ = {
143+
isa = PBXContainerItemProxy;
144+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
145+
proxyType = 2;
146+
remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
147+
remoteInfo = "jsinspector-tvOS";
148+
};
149+
2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */ = {
150+
isa = PBXContainerItemProxy;
151+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
152+
proxyType = 2;
153+
remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
154+
remoteInfo = "third-party";
155+
};
156+
2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */ = {
157+
isa = PBXContainerItemProxy;
158+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
159+
proxyType = 2;
160+
remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
161+
remoteInfo = "third-party-tvOS";
162+
};
163+
2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */ = {
164+
isa = PBXContainerItemProxy;
165+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
166+
proxyType = 2;
167+
remoteGlobalIDString = 139D7E881E25C6D100323FB7;
168+
remoteInfo = "double-conversion";
169+
};
170+
2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */ = {
171+
isa = PBXContainerItemProxy;
172+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
173+
proxyType = 2;
174+
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
175+
remoteInfo = "double-conversion-tvOS";
176+
};
177+
2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
178+
isa = PBXContainerItemProxy;
179+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
180+
proxyType = 2;
181+
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
182+
remoteInfo = privatedata;
183+
};
184+
2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
185+
isa = PBXContainerItemProxy;
186+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
187+
proxyType = 2;
188+
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
189+
remoteInfo = "privatedata-tvOS";
190+
};
134191
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
135192
isa = PBXContainerItemProxy;
136193
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -336,6 +393,7 @@
336393
isa = PBXFrameworksBuildPhase;
337394
buildActionMask = 2147483647;
338395
files = (
396+
2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */,
339397
);
340398
runOnlyForDeploymentPostprocessing = 0;
341399
};
@@ -439,13 +497,21 @@
439497
isa = PBXGroup;
440498
children = (
441499
146834041AC3E56700842450 /* libReact.a */,
500+
3DAD3EA31DF850E9000B6D8A /* libReact.a */,
442501
3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
443502
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
444503
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
445504
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
446505
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
447506
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
448-
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
507+
2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
508+
2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
509+
2DF0FFE32056DD460020B375 /* libthird-party.a */,
510+
2DF0FFE52056DD460020B375 /* libthird-party.a */,
511+
2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
512+
2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
513+
2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
514+
2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
449515
);
450516
name = Products;
451517
sourceTree = "<group>";
@@ -786,6 +852,62 @@
786852
remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */;
787853
sourceTree = BUILT_PRODUCTS_DIR;
788854
};
855+
2DF0FFDF2056DD460020B375 /* libjsinspector.a */ = {
856+
isa = PBXReferenceProxy;
857+
fileType = archive.ar;
858+
path = libjsinspector.a;
859+
remoteRef = 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */;
860+
sourceTree = BUILT_PRODUCTS_DIR;
861+
};
862+
2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */ = {
863+
isa = PBXReferenceProxy;
864+
fileType = archive.ar;
865+
path = "libjsinspector-tvOS.a";
866+
remoteRef = 2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */;
867+
sourceTree = BUILT_PRODUCTS_DIR;
868+
};
869+
2DF0FFE32056DD460020B375 /* libthird-party.a */ = {
870+
isa = PBXReferenceProxy;
871+
fileType = archive.ar;
872+
path = "libthird-party.a";
873+
remoteRef = 2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */;
874+
sourceTree = BUILT_PRODUCTS_DIR;
875+
};
876+
2DF0FFE52056DD460020B375 /* libthird-party.a */ = {
877+
isa = PBXReferenceProxy;
878+
fileType = archive.ar;
879+
path = "libthird-party.a";
880+
remoteRef = 2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */;
881+
sourceTree = BUILT_PRODUCTS_DIR;
882+
};
883+
2DF0FFE72056DD460020B375 /* libdouble-conversion.a */ = {
884+
isa = PBXReferenceProxy;
885+
fileType = archive.ar;
886+
path = "libdouble-conversion.a";
887+
remoteRef = 2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */;
888+
sourceTree = BUILT_PRODUCTS_DIR;
889+
};
890+
2DF0FFE92056DD460020B375 /* libdouble-conversion.a */ = {
891+
isa = PBXReferenceProxy;
892+
fileType = archive.ar;
893+
path = "libdouble-conversion.a";
894+
remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
895+
sourceTree = BUILT_PRODUCTS_DIR;
896+
};
897+
2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
898+
isa = PBXReferenceProxy;
899+
fileType = archive.ar;
900+
path = libprivatedata.a;
901+
remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
902+
sourceTree = BUILT_PRODUCTS_DIR;
903+
};
904+
2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
905+
isa = PBXReferenceProxy;
906+
fileType = archive.ar;
907+
path = "libprivatedata-tvOS.a";
908+
remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
909+
sourceTree = BUILT_PRODUCTS_DIR;
910+
};
789911
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
790912
isa = PBXReferenceProxy;
791913
fileType = archive.ar;
@@ -828,10 +950,10 @@
828950
remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
829951
sourceTree = BUILT_PRODUCTS_DIR;
830952
};
831-
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
953+
3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
832954
isa = PBXReferenceProxy;
833955
fileType = archive.ar;
834-
path = "libReact-tvOS.a";
956+
path = libReact.a;
835957
remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
836958
sourceTree = BUILT_PRODUCTS_DIR;
837959
};
@@ -1179,6 +1301,10 @@
11791301
GCC_NO_COMMON_BLOCKS = YES;
11801302
INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist";
11811303
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1304+
OTHER_LDFLAGS = (
1305+
"-ObjC",
1306+
"-lc++",
1307+
);
11821308
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests";
11831309
PRODUCT_NAME = "$(TARGET_NAME)";
11841310
SDKROOT = appletvos;
@@ -1200,6 +1326,10 @@
12001326
GCC_NO_COMMON_BLOCKS = YES;
12011327
INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist";
12021328
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1329+
OTHER_LDFLAGS = (
1330+
"-ObjC",
1331+
"-lc++",
1332+
);
12031333
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests";
12041334
PRODUCT_NAME = "$(TARGET_NAME)";
12051335
SDKROOT = appletvos;

0 commit comments

Comments
 (0)