Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Unified Diff: test/ios/app-bundle/test-archs.gyp

Issue 81213003: Fix default ARCHS value for iOS project. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Addressing comments Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/ios/app-bundle/TestApp/only-compile-in-64-bits.m ('k') | test/ios/gyptest-archs.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/ios/app-bundle/test-archs.gyp
diff --git a/test/ios/app-bundle/test-device.gyp b/test/ios/app-bundle/test-archs.gyp
similarity index 52%
copy from test/ios/app-bundle/test-device.gyp
copy to test/ios/app-bundle/test-archs.gyp
index 28cdbb3af58af33b5725c15e68de09e5409e2f69..b526629d7f15028a45920f445c703f029cd2ba4b 100644
--- a/test/ios/app-bundle/test-device.gyp
+++ b/test/ios/app-bundle/test-archs.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Google Inc. All rights reserved.
+# Copyright (c) 2013 Google Inc. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
@@ -7,13 +7,14 @@
],
'targets': [
{
- 'target_name': 'test_app',
- 'product_name': 'Test App Gyp',
+ 'target_name': 'test_no_archs',
+ 'product_name': 'Test No Archs',
'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',
@@ -26,24 +27,22 @@
],
},
'xcode_settings': {
- 'OTHER_CFLAGS': [
- '-fobjc-abi-version=2',
- ],
'SDKROOT': 'iphonesimulator', # -isysroot
'TARGETED_DEVICE_FAMILY': '1,2',
'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
- 'IPHONEOS_DEPLOYMENT_TARGET': '4.2',
+ 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
'CONFIGURATION_BUILD_DIR':'build/Default',
},
},
{
- 'target_name': 'sig_test',
- 'product_name': 'sig_test',
+ 'target_name': 'test_archs_i386',
+ 'product_name': 'Test Archs i386',
'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',
@@ -55,24 +54,42 @@
'$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
],
},
- 'postbuilds': [
- {
- 'postbuild_name': 'Verify no signature',
- 'action': [
- 'python',
- 'TestApp/check_no_signature.py'
- ],
- },
- ],
'xcode_settings': {
- 'OTHER_CFLAGS': [
- '-fobjc-abi-version=2',
+ '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',
+ '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': {
'SDKROOT': 'iphonesimulator', # -isysroot
- 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
+ 'TARGETED_DEVICE_FAMILY': '1,2',
'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
- 'IPHONEOS_DEPLOYMENT_TARGET': '4.2',
- 'CONFIGURATION_BUILD_DIR':'buildsig/Default',
+ 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
+ 'CONFIGURATION_BUILD_DIR':'build/Default',
+ 'ARCHS': ['x86_64'],
},
},
],
« no previous file with comments | « test/ios/app-bundle/TestApp/only-compile-in-64-bits.m ('k') | test/ios/gyptest-archs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698