Index: test/ios/app-bundle/test-archs.gyp |
diff --git a/test/ios/app-bundle/test-archs.gyp b/test/ios/app-bundle/test-archs.gyp |
index 761fd6b12947a914969b7e2733e9ca8d1e670685..b1558c94becc80e9e539f597ce52e2bc61321987 100644 |
--- a/test/ios/app-bundle/test-archs.gyp |
+++ b/test/ios/app-bundle/test-archs.gyp |
@@ -5,101 +5,106 @@ |
'make_global_settings': [ |
['CC', '/usr/bin/clang'], |
], |
+ 'target_defaults': { |
+ 'product_extension': 'bundle', |
+ 'mac_bundle_resources': [ |
+ 'TestApp/English.lproj/InfoPlist.strings', |
+ 'TestApp/English.lproj/MainMenu.xib', |
+ ], |
+ 'link_settings': { |
+ 'libraries': [ |
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |
+ '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', |
+ ], |
+ }, |
+ 'xcode_settings': { |
+ 'OTHER_CFLAGS': [ |
+ '-fobjc-abi-version=2', |
+ ], |
+ 'CODE_SIGNING_REQUIRED': 'NO', |
+ 'SDKROOT': 'iphonesimulator', # -isysroot |
+ 'TARGETED_DEVICE_FAMILY': '1,2', |
+ 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', |
+ 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', |
+ 'CONFIGURATION_BUILD_DIR':'build/Default', |
+ }, |
+ }, |
'targets': [ |
{ |
- 'target_name': 'test_no_archs', |
- 'product_name': 'Test No Archs', |
+ 'target_name': 'TestNoArchs', |
+ 'product_name': 'TestNoArchs', |
'type': 'executable', |
- 'product_extension': 'bundle', |
'mac_bundle': 1, |
'sources': [ |
'TestApp/main.m', |
'TestApp/only-compile-in-32-bits.m', |
], |
- 'mac_bundle_resources': [ |
- 'TestApp/English.lproj/InfoPlist.strings', |
- 'TestApp/English.lproj/MainMenu.xib', |
- ], |
- 'link_settings': { |
- 'libraries': [ |
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |
- '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', |
- ], |
- }, |
'xcode_settings': { |
- 'OTHER_CFLAGS': [ |
- '-fobjc-abi-version=2', |
+ 'VALID_ARCHS': [ |
+ 'i386', |
+ 'x86_64', |
+ 'arm64', |
+ 'armv7', |
], |
- 'SDKROOT': 'iphonesimulator', # -isysroot |
- 'TARGETED_DEVICE_FAMILY': '1,2', |
- 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', |
- 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', |
- 'CONFIGURATION_BUILD_DIR':'build/Default', |
- }, |
+ } |
}, |
{ |
- 'target_name': 'test_archs_i386', |
- 'product_name': 'Test Archs i386', |
+ 'target_name': 'TestArch32Bits', |
+ 'product_name': 'TestArch32Bits', |
'type': 'executable', |
- 'product_extension': 'bundle', |
'mac_bundle': 1, |
'sources': [ |
'TestApp/main.m', |
'TestApp/only-compile-in-32-bits.m', |
], |
- 'mac_bundle_resources': [ |
- 'TestApp/English.lproj/InfoPlist.strings', |
- 'TestApp/English.lproj/MainMenu.xib', |
- ], |
- 'link_settings': { |
- 'libraries': [ |
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |
- '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', |
- ], |
- }, |
'xcode_settings': { |
- 'OTHER_CFLAGS': [ |
- '-fobjc-abi-version=2', |
+ 'ARCHS': [ |
+ '$(ARCHS_STANDARD)', |
+ ], |
+ 'VALID_ARCHS': [ |
+ 'i386', |
+ 'armv7', |
], |
- 'SDKROOT': 'iphonesimulator', # -isysroot |
- 'TARGETED_DEVICE_FAMILY': '1,2', |
- 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', |
- 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', |
- 'CONFIGURATION_BUILD_DIR':'build/Default', |
- 'ARCHS': ['i386'], |
}, |
}, |
{ |
- 'target_name': 'test_archs_x86_64', |
- 'product_name': 'Test Archs x86_64', |
+ 'target_name': 'TestArch64Bits', |
+ 'product_name': 'TestArch64Bits', |
'type': 'executable', |
- 'product_extension': 'bundle', |
'mac_bundle': 1, |
'sources': [ |
'TestApp/main.m', |
'TestApp/only-compile-in-64-bits.m', |
], |
- 'mac_bundle_resources': [ |
- 'TestApp/English.lproj/InfoPlist.strings', |
- 'TestApp/English.lproj/MainMenu.xib', |
- ], |
- 'link_settings': { |
- 'libraries': [ |
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |
- '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', |
+ 'xcode_settings': { |
+ 'ARCHS': [ |
+ '$(ARCHS_STANDARD_INCLUDING_64_BIT)', |
+ ], |
+ 'VALID_ARCHS': [ |
+ 'x86_64', |
+ 'arm64', |
], |
}, |
+ }, |
+ { |
+ 'target_name': 'TestMultiArchs', |
+ 'product_name': 'TestMultiArchs', |
+ 'type': 'executable', |
+ 'mac_bundle': 1, |
+ 'sources': [ |
+ 'TestApp/main.m', |
+ ], |
'xcode_settings': { |
- 'OTHER_CFLAGS': [ |
- '-fobjc-abi-version=2', |
+ 'ARCHS': [ |
+ '$(ARCHS_STANDARD_INCLUDING_64_BIT)', |
], |
- 'SDKROOT': 'iphonesimulator', # -isysroot |
- 'TARGETED_DEVICE_FAMILY': '1,2', |
- 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', |
- 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', |
- 'CONFIGURATION_BUILD_DIR':'build/Default', |
- 'ARCHS': ['x86_64'], |
- }, |
+ 'VALID_ARCHS': [ |
+ 'x86_64', |
+ 'i386', |
+ 'arm64', |
+ 'armv7', |
+ ], |
+ } |
}, |
], |
} |