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

Side by Side Diff: test/ios/app-bundle/test-archs.gyp

Issue 88813002: Disable building simulator for "x86_64" (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Fix tests on bots Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/ios/gyptest-archs.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 Google Inc. All rights reserved. 1 # Copyright (c) 2013 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'make_global_settings': [ 5 'make_global_settings': [
6 ['CC', '/usr/bin/clang'], 6 ['CC', '/usr/bin/clang'],
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'test_no_archs', 10 'target_name': 'test_no_archs',
11 'product_name': 'Test No Archs', 11 'product_name': 'Test No Archs',
12 'type': 'executable', 12 'type': 'executable',
13 'product_extension': 'bundle', 13 'product_extension': 'bundle',
14 'mac_bundle': 1, 14 'mac_bundle': 1,
15 'sources': [ 15 'sources': [
16 'TestApp/main.m', 16 'TestApp/main.m',
17 'TestApp/only-compile-in-32-bits.m', 17 'TestApp/only-compile-in-32-bits.m',
18 ], 18 ],
19 'mac_bundle_resources': [ 19 'mac_bundle_resources': [
20 'TestApp/English.lproj/InfoPlist.strings', 20 'TestApp/English.lproj/InfoPlist.strings',
21 'TestApp/English.lproj/MainMenu.xib', 21 'TestApp/English.lproj/MainMenu.xib',
22 ], 22 ],
23 'link_settings': { 23 'link_settings': {
24 'libraries': [ 24 'libraries': [
25 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 25 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
26 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 26 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
27 ], 27 ],
28 }, 28 },
29 'xcode_settings': { 29 'xcode_settings': {
30 'OTHER_CFLAGS': [
31 '-fobjc-abi-version=2',
32 ],
30 'SDKROOT': 'iphonesimulator', # -isysroot 33 'SDKROOT': 'iphonesimulator', # -isysroot
31 'TARGETED_DEVICE_FAMILY': '1,2', 34 'TARGETED_DEVICE_FAMILY': '1,2',
32 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 35 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
33 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', 36 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
34 'CONFIGURATION_BUILD_DIR':'build/Default', 37 'CONFIGURATION_BUILD_DIR':'build/Default',
35 }, 38 },
36 }, 39 },
37 { 40 {
38 'target_name': 'test_archs_i386', 41 'target_name': 'test_archs_i386',
39 'product_name': 'Test Archs i386', 42 'product_name': 'Test Archs i386',
40 'type': 'executable', 43 'type': 'executable',
41 'product_extension': 'bundle', 44 'product_extension': 'bundle',
42 'mac_bundle': 1, 45 'mac_bundle': 1,
43 'sources': [ 46 'sources': [
44 'TestApp/main.m', 47 'TestApp/main.m',
45 'TestApp/only-compile-in-32-bits.m', 48 'TestApp/only-compile-in-32-bits.m',
46 ], 49 ],
47 'mac_bundle_resources': [ 50 'mac_bundle_resources': [
48 'TestApp/English.lproj/InfoPlist.strings', 51 'TestApp/English.lproj/InfoPlist.strings',
49 'TestApp/English.lproj/MainMenu.xib', 52 'TestApp/English.lproj/MainMenu.xib',
50 ], 53 ],
51 'link_settings': { 54 'link_settings': {
52 'libraries': [ 55 'libraries': [
53 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 56 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
54 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 57 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
55 ], 58 ],
56 }, 59 },
57 'xcode_settings': { 60 'xcode_settings': {
61 'OTHER_CFLAGS': [
62 '-fobjc-abi-version=2',
63 ],
58 'SDKROOT': 'iphonesimulator', # -isysroot 64 'SDKROOT': 'iphonesimulator', # -isysroot
59 'TARGETED_DEVICE_FAMILY': '1,2', 65 'TARGETED_DEVICE_FAMILY': '1,2',
60 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 66 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
61 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', 67 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
62 'CONFIGURATION_BUILD_DIR':'build/Default', 68 'CONFIGURATION_BUILD_DIR':'build/Default',
63 'ARCHS': ['i386'], 69 'ARCHS': ['i386'],
64 }, 70 },
65 }, 71 },
66 { 72 {
67 'target_name': 'test_archs_x86_64', 73 'target_name': 'test_archs_x86_64',
68 'product_name': 'Test Archs x86_64', 74 'product_name': 'Test Archs x86_64',
69 'type': 'executable', 75 'type': 'executable',
70 'product_extension': 'bundle', 76 'product_extension': 'bundle',
71 'mac_bundle': 1, 77 'mac_bundle': 1,
72 'sources': [ 78 'sources': [
73 'TestApp/main.m', 79 'TestApp/main.m',
74 'TestApp/only-compile-in-64-bits.m', 80 'TestApp/only-compile-in-64-bits.m',
75 ], 81 ],
76 'mac_bundle_resources': [ 82 'mac_bundle_resources': [
77 'TestApp/English.lproj/InfoPlist.strings', 83 'TestApp/English.lproj/InfoPlist.strings',
78 'TestApp/English.lproj/MainMenu.xib', 84 'TestApp/English.lproj/MainMenu.xib',
79 ], 85 ],
80 'link_settings': { 86 'link_settings': {
81 'libraries': [ 87 'libraries': [
82 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 88 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
83 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 89 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
84 ], 90 ],
85 }, 91 },
86 'xcode_settings': { 92 'xcode_settings': {
93 'OTHER_CFLAGS': [
94 '-fobjc-abi-version=2',
95 ],
87 'SDKROOT': 'iphonesimulator', # -isysroot 96 'SDKROOT': 'iphonesimulator', # -isysroot
88 'TARGETED_DEVICE_FAMILY': '1,2', 97 'TARGETED_DEVICE_FAMILY': '1,2',
89 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 98 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
90 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', 99 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
91 'CONFIGURATION_BUILD_DIR':'build/Default', 100 'CONFIGURATION_BUILD_DIR':'build/Default',
92 'ARCHS': ['x86_64'], 101 'ARCHS': ['x86_64'],
93 }, 102 },
94 }, 103 },
95 ], 104 ],
96 } 105 }
OLDNEW
« no previous file with comments | « no previous file | test/ios/gyptest-archs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698