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

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

Issue 1701503002: Re-land update Xcode emulation extra plist items for Xcode 7.2 (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Remove extra call to self._GetSdkVersionInfoItem Created 4 years, 10 months 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
« no previous file with comments | « test/ios/app-bundle/test-archs.gyp ('k') | 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) 2011 Google Inc. All rights reserved. 1 # Copyright (c) 2011 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 'conditions': [
6 ['CC', '/usr/bin/clang'], 6 ['"<(GENERATOR)"=="xcode"', {
7 'target_defaults': {
8 'configurations': {
9 'Default': {
10 'xcode_settings': {
11 'SDKROOT': 'iphonesimulator',
12 'CONFIGURATION_BUILD_DIR':'build/Default',
13 }
14 },
15 'Default-iphoneos': {
16 'xcode_settings': {
17 'SDKROOT': 'iphoneos',
18 'CONFIGURATION_BUILD_DIR':'build/Default-iphoneos',
19 }
20 },
21 },
22 },
23 }, {
24 'target_defaults': {
25 'configurations': {
26 'Default': {
27 'xcode_settings': {
28 'SDKROOT': 'iphonesimulator',
29 }
30 },
31 },
32 },
33 }],
7 ], 34 ],
8 'targets': [ 35 'targets': [
9 { 36 {
10 'target_name': 'test_app', 37 'target_name': 'test_app',
11 'product_name': 'Test App Gyp', 38 'product_name': 'Test App Gyp',
12 'type': 'executable', 39 'type': 'executable',
13 'product_extension': 'bundle',
14 'mac_bundle': 1, 40 'mac_bundle': 1,
15 'sources': [ 41 'sources': [
16 'TestApp/main.m', 42 'TestApp/main.m',
17 ], 43 ],
18 'mac_bundle_resources': [ 44 'mac_bundle_resources': [
19 'TestApp/English.lproj/InfoPlist.strings', 45 'TestApp/English.lproj/InfoPlist.strings',
20 'TestApp/English.lproj/MainMenu.xib', 46 'TestApp/English.lproj/MainMenu.xib',
21 ], 47 ],
22 'link_settings': { 48 'link_settings': {
23 'libraries': [ 49 'libraries': [
24 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 50 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
25 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 51 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
26 ], 52 ],
27 }, 53 },
28 'xcode_settings': { 54 'xcode_settings': {
29 'OTHER_CFLAGS': [ 55 'OTHER_CFLAGS': [
30 '-fobjc-abi-version=2', 56 '-fobjc-abi-version=2',
31 ], 57 ],
32 'SDKROOT': 'iphonesimulator', # -isysroot 58 'SDKROOT': 'iphonesimulator', # -isysroot
33 'TARGETED_DEVICE_FAMILY': '1,2', 59 'TARGETED_DEVICE_FAMILY': '1,2',
60 'INFOPLIST_OUTPUT_FORMAT':'xml',
61 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
34 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 62 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
35 'IPHONEOS_DEPLOYMENT_TARGET': '4.2', 63 'IPHONEOS_DEPLOYMENT_TARGET': '8.0',
36 'CONFIGURATION_BUILD_DIR':'build/Default', 64 'CODE_SIGNING_REQUIRED': 'NO',
65 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
66
37 }, 67 },
38 }, 68 },
39 { 69 {
40 'target_name': 'sig_test', 70 'target_name': 'sig_test',
41 'product_name': 'sig_test', 71 'product_name': 'sigtest',
42 'type': 'executable', 72 'type': 'executable',
43 'product_extension': 'bundle',
44 'mac_bundle': 1, 73 'mac_bundle': 1,
45 'sources': [ 74 'sources': [
46 'TestApp/main.m', 75 'TestApp/main.m',
47 ], 76 ],
48 'mac_bundle_resources': [ 77 'mac_bundle_resources': [
49 'TestApp/English.lproj/InfoPlist.strings', 78 'TestApp/English.lproj/InfoPlist.strings',
50 'TestApp/English.lproj/MainMenu.xib', 79 'TestApp/English.lproj/MainMenu.xib',
51 ], 80 ],
52 'link_settings': { 81 'link_settings': {
53 'libraries': [ 82 'libraries': [
54 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 83 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
55 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 84 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
56 ], 85 ],
57 }, 86 },
58 'postbuilds': [ 87 'postbuilds': [
59 { 88 {
60 'postbuild_name': 'Verify no signature', 89 'postbuild_name': 'Verify no signature',
61 'action': [ 90 'action': [
62 'python', 91 'python',
63 'TestApp/check_no_signature.py' 92 'TestApp/check_no_signature.py'
64 ], 93 ],
65 }, 94 },
66 ], 95 ],
67 'xcode_settings': { 96 'xcode_settings': {
68 'OTHER_CFLAGS': [ 97 'OTHER_CFLAGS': [
69 '-fobjc-abi-version=2', 98 '-fobjc-abi-version=2',
70 ], 99 ],
71 'SDKROOT': 'iphonesimulator', # -isysroot 100 'SDKROOT': 'iphonesimulator', # -isysroot
72 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', 101 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
102 'INFOPLIST_OUTPUT_FORMAT':'xml',
73 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 103 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
74 'IPHONEOS_DEPLOYMENT_TARGET': '4.2', 104 'IPHONEOS_DEPLOYMENT_TARGET': '8.0',
75 'CONFIGURATION_BUILD_DIR':'buildsig/Default', 105 'CONFIGURATION_BUILD_DIR':'buildsig/Default',
76 }, 106 },
77 }, 107 },
78 ], 108 ],
79 } 109 }
OLDNEW
« no previous file with comments | « test/ios/app-bundle/test-archs.gyp ('k') | test/ios/gyptest-archs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698