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

Side by Side Diff: testing/iossim/iossim.gyp

Issue 1028333002: Chromium -> Mojo roll. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « testing/commit_queue/config.json ('k') | third_party/boringssl/boringssl_unittest.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. 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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS!="ios" or "<(GENERATOR)"=="ninja"', { 7 ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'iossim', 10 'target_name': 'iossim',
11 'toolsets': ['host'], 11 'toolsets': ['host'],
12 'type': 'executable', 12 'type': 'executable',
13 'variables': { 13 'variables': {
14 'developer_dir': '<!(xcode-select -print-path)', 14 'developer_dir': '<!(xcode-select -print-path)',
15 # TODO(lliabraa): Once all builders are on Xcode 6 this variable can 15 # TODO(lliabraa): Once all builders are on Xcode 6 this variable can
16 # be removed and the actions gated by this variable can be run by 16 # be removed and the actions gated by this variable can be run by
17 # default (crbug.com/385030). 17 # default (crbug.com/385030).
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 }, 119 },
120 ], # actions 120 ], # actions
121 'xcode_settings': { 121 'xcode_settings': {
122 'ARCHS': ['x86_64'], 122 'ARCHS': ['x86_64'],
123 'WARNING_CFLAGS': [ 123 'WARNING_CFLAGS': [
124 '-Wno-objc-property-no-attribute', 124 '-Wno-objc-property-no-attribute',
125 ], 125 ],
126 }, 126 },
127 }, 127 },
128 ], 128 ],
129 }, { # else, OS=="ios" and "<(GENERATOR)"!="ninja" 129 }, { # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR) "!="ninja"
130 'variables': { 130 'variables': {
131 'ninja_output_dir': 'ninja-iossim', 131 'ninja_output_dir': 'ninja-iossim',
132 'ninja_product_dir': 132 'ninja_product_dir':
133 '$(SYMROOT)/<(ninja_output_dir)/<(CONFIGURATION_NAME)', 133 '$(SYMROOT)/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
134 }, 134 },
135 'targets': [ 135 'targets': [
136 { 136 {
137 'target_name': 'iossim', 137 'target_name': 'iossim',
138 'type': 'none', 138 'type': 'none',
139 'toolsets': ['host'], 139 'toolsets': ['host'],
(...skipping 14 matching lines...) Expand all
154 'iossim', 154 'iossim',
155 ], 155 ],
156 'message': 'Generating the iossim executable', 156 'message': 'Generating the iossim executable',
157 }, 157 },
158 ], 158 ],
159 }, 159 },
160 ], 160 ],
161 }], 161 }],
162 ], 162 ],
163 } 163 }
OLDNEW
« no previous file with comments | « testing/commit_queue/config.json ('k') | third_party/boringssl/boringssl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698