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: scripts/slave/recipe_modules/chromium/config.py

Issue 2436723003: Never use the hermetic xcode toolchain for iOS recipes. (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/ios/api.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 GYP_CROSSCOMPILE = Single(int, jsonish_fn=str, required=False), 56 GYP_CROSSCOMPILE = Single(int, jsonish_fn=str, required=False),
57 GYP_CHROMIUM_NO_ACTION = Single(int, jsonish_fn=str, required=False), 57 GYP_CHROMIUM_NO_ACTION = Single(int, jsonish_fn=str, required=False),
58 GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)), 58 GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)),
59 GYP_GENERATORS = Set(basestring, ','.join), 59 GYP_GENERATORS = Set(basestring, ','.join),
60 GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)), 60 GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)),
61 GYP_INCLUDE_LAST = Single(Path, required=False), 61 GYP_INCLUDE_LAST = Single(Path, required=False),
62 GYP_LINK_CONCURRENCY = Single(int, required=False), 62 GYP_LINK_CONCURRENCY = Single(int, required=False),
63 GYP_MSVS_VERSION = Single(basestring, required=False), 63 GYP_MSVS_VERSION = Single(basestring, required=False),
64 GYP_USE_SEPARATE_MSPDBSRV = Single(int, jsonish_fn=str, required=False), 64 GYP_USE_SEPARATE_MSPDBSRV = Single(int, jsonish_fn=str, required=False),
65 LLVM_DOWNLOAD_GOLD_PLUGIN = Single(int, required=False), 65 LLVM_DOWNLOAD_GOLD_PLUGIN = Single(int, required=False),
66 FORCE_MAC_TOOLCHAIN = Single(int, required=False),
67 ), 66 ),
68 env = ConfigGroup( 67 env = ConfigGroup(
69 PATH = List(Path), 68 PATH = List(Path),
70 ADB_VENDOR_KEYS = Single(Path, required=False), 69 ADB_VENDOR_KEYS = Single(Path, required=False),
71 LLVM_FORCE_HEAD_REVISION = Single(basestring, required=False), 70 LLVM_FORCE_HEAD_REVISION = Single(basestring, required=False),
72 GOMA_STUBBY_PROXY_IP_ADDRESS = Single(basestring, required=False), 71 GOMA_STUBBY_PROXY_IP_ADDRESS = Single(basestring, required=False),
73 FORCE_MAC_TOOLCHAIN = Single(int, required=False), 72 FORCE_MAC_TOOLCHAIN = Single(int, required=False),
74 ), 73 ),
75 project_generator = ConfigGroup( 74 project_generator = ConfigGroup(
76 tool = Single(basestring, empty_val='gyp'), 75 tool = Single(basestring, empty_val='gyp'),
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 def ninja(c): 228 def ninja(c):
230 if c.TARGET_PLATFORM == 'ios': 229 if c.TARGET_PLATFORM == 'ios':
231 c.gyp_env.GYP_GENERATORS.add('ninja') 230 c.gyp_env.GYP_GENERATORS.add('ninja')
232 231
233 out_path = 'out' 232 out_path = 'out'
234 if c.TARGET_CROS_BOARD: 233 if c.TARGET_CROS_BOARD:
235 out_path += '_%s' % (c.TARGET_CROS_BOARD,) 234 out_path += '_%s' % (c.TARGET_CROS_BOARD,)
236 c.build_dir = c.CHECKOUT_PATH.join(out_path) 235 c.build_dir = c.CHECKOUT_PATH.join(out_path)
237 236
238 @config_ctx() 237 @config_ctx()
238 def force_mac_toolchain_off(c):
239 c.env.FORCE_MAC_TOOLCHAIN = 0
240
241 @config_ctx()
239 def msvs2013(c): 242 def msvs2013(c):
240 c.gn_args.append('visual_studio_version=2013') 243 c.gn_args.append('visual_studio_version=2013')
241 c.gyp_env.GYP_MSVS_VERSION = '2013' 244 c.gyp_env.GYP_MSVS_VERSION = '2013'
242 245
243 @config_ctx() 246 @config_ctx()
244 def msvs2015(c): 247 def msvs2015(c):
245 c.gn_args.append('visual_studio_version=2015') 248 c.gn_args.append('visual_studio_version=2015')
246 c.gyp_env.GYP_MSVS_VERSION = '2015' 249 c.gyp_env.GYP_MSVS_VERSION = '2015'
247 250
248 @config_ctx() 251 @config_ctx()
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 def cast_linux(c): 807 def cast_linux(c):
805 c.gyp_env.GYP_DEFINES['chromecast'] = 1 808 c.gyp_env.GYP_DEFINES['chromecast'] = 1
806 809
807 @config_ctx() 810 @config_ctx()
808 def internal_gles2_conform_tests(c): 811 def internal_gles2_conform_tests(c):
809 c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1 812 c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
810 813
811 @config_ctx() 814 @config_ctx()
812 def build_angle_deqp_tests(c): 815 def build_angle_deqp_tests(c):
813 c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1 816 c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/ios/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698