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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.py

Issue 2411243003: Revert of Download the hermetic xcode toolchain on all bots that target mac. (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium_chrome.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 import pipes 5 import pipes
6 6
7 from recipe_engine.config import config_item_context, ConfigGroup 7 from recipe_engine.config import config_item_context, ConfigGroup
8 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf 8 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf
9 from recipe_engine.config_types import Path 9 from recipe_engine.config_types import Path
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 ('arm', 32): 'arm', 180 ('arm', 32): 'arm',
181 ('arm', 64): 'arm64', 181 ('arm', 64): 'arm64',
182 ('mips', 32): 'mips', 182 ('mips', 32): 'mips',
183 ('mips', 64): 'mips64', 183 ('mips', 64): 'mips64',
184 ('mipsel', 32): 'mipsel', 184 ('mipsel', 32): 'mipsel',
185 ('mipsel', 64): 'mips64el', 185 ('mipsel', 64): 'mips64el',
186 }.get((c.TARGET_ARCH, c.TARGET_BITS)) 186 }.get((c.TARGET_ARCH, c.TARGET_BITS))
187 if gyp_arch: 187 if gyp_arch:
188 c.gyp_env.GYP_DEFINES['target_arch'] = gyp_arch 188 c.gyp_env.GYP_DEFINES['target_arch'] = gyp_arch
189 189
190 if c.TARGET_PLATFORM == 'mac':
191 c.env.FORCE_MAC_TOOLCHAIN = 1
192
193 if c.BUILD_CONFIG in ['Coverage', 'Release']: 190 if c.BUILD_CONFIG in ['Coverage', 'Release']:
194 # The 'Coverage' target is not explicitly used by Chrome, but by some other 191 # The 'Coverage' target is not explicitly used by Chrome, but by some other
195 # projects in the Chrome ecosystem (ie: Syzygy). 192 # projects in the Chrome ecosystem (ie: Syzygy).
196 static_library(c, final=False) 193 static_library(c, final=False)
197 elif c.BUILD_CONFIG == 'Debug': 194 elif c.BUILD_CONFIG == 'Debug':
198 shared_library(c, final=False) 195 shared_library(c, final=False)
199 else: # pragma: no cover 196 else: # pragma: no cover
200 raise BadConf('Unknown build config "%s"' % c.BUILD_CONFIG) 197 raise BadConf('Unknown build config "%s"' % c.BUILD_CONFIG)
201 198
202 @config_ctx() 199 @config_ctx()
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 def cast_linux(c): 796 def cast_linux(c):
800 c.gyp_env.GYP_DEFINES['chromecast'] = 1 797 c.gyp_env.GYP_DEFINES['chromecast'] = 1
801 798
802 @config_ctx() 799 @config_ctx()
803 def internal_gles2_conform_tests(c): 800 def internal_gles2_conform_tests(c):
804 c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1 801 c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
805 802
806 @config_ctx() 803 @config_ctx()
807 def build_angle_deqp_tests(c): 804 def build_angle_deqp_tests(c):
808 c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1 805 c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1
806
807 @config_ctx()
808 def force_mac_toolchain(c):
809 c.env.FORCE_MAC_TOOLCHAIN = 1
810 c.gyp_env.FORCE_MAC_TOOLCHAIN = 1
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/chromium_chrome.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698