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

Side by Side Diff: scripts/slave/recipe_modules/ios/api.py

Issue 1730353002: WebRTC: Use custom mb_config_path for standalone bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 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 | « no previous file | scripts/slave/recipes/webrtc/ios.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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 copy 5 import copy
6 6
7 from recipe_engine import recipe_api 7 from recipe_engine import recipe_api
8 8
9 9
10 class iOSApi(recipe_api.RecipeApi): 10 class iOSApi(recipe_api.RecipeApi):
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 '--version', self.__config['xcode version'], 225 '--version', self.__config['xcode version'],
226 ], step_test_data=lambda: self.m.json.test_api.output({})) 226 ], step_test_data=lambda: self.m.json.test_api.output({}))
227 227
228 cfg = self.m.chromium.make_config() 228 cfg = self.m.chromium.make_config()
229 229
230 if self.using_gyp: 230 if self.using_gyp:
231 cfg.gyp_env.GYP_CROSSCOMPILE = 1 231 cfg.gyp_env.GYP_CROSSCOMPILE = 1
232 cfg.gyp_env.GYP_DEFINES = copy.deepcopy(self.__config['GYP_DEFINES']) 232 cfg.gyp_env.GYP_DEFINES = copy.deepcopy(self.__config['GYP_DEFINES'])
233 self.m.chromium.c = cfg 233 self.m.chromium.c = cfg
234 234
235 def build(self, suffix=None): 235 def build(self, mb_config_path=None, suffix=None):
236 """Builds from this bot's build config.""" 236 """Builds from this bot's build config."""
237 assert self.__config is not None 237 assert self.__config is not None
238 238
239 suffix = ' (%s)' % suffix if suffix else '' 239 suffix = ' (%s)' % suffix if suffix else ''
240 240
241 if self.using_mb: 241 if self.using_mb:
242 self.m.chromium.c.project_generator.tool = 'mb' 242 self.m.chromium.c.project_generator.tool = 'mb'
243 243
244 # Add the default GYP_DEFINES. 244 # Add the default GYP_DEFINES.
245 if isinstance(self.__config['GYP_DEFINES'], dict): 245 if isinstance(self.__config['GYP_DEFINES'], dict):
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 step_result.presentation.step_text = ( 297 step_result.presentation.step_text = (
298 '<br />GYP_DEFINES:<br />%s' % '<br />'.join(gyp_defines) 298 '<br />GYP_DEFINES:<br />%s' % '<br />'.join(gyp_defines)
299 ) 299 )
300 if self.using_mb: 300 if self.using_mb:
301 step_result.presentation.step_text += '<br />GYP_CHROMIUM_NO_ACTION=1' 301 step_result.presentation.step_text += '<br />GYP_CHROMIUM_NO_ACTION=1'
302 302
303 if self.using_mb: 303 if self.using_mb:
304 self.m.chromium.run_mb(self.m.properties['mastername'], 304 self.m.chromium.run_mb(self.m.properties['mastername'],
305 self.m.properties['buildername'], 305 self.m.properties['buildername'],
306 name='generate_build_files' + suffix, 306 name='generate_build_files' + suffix,
307 mb_config_path=mb_config_path,
307 build_dir='//out/' + build_sub_path) 308 build_dir='//out/' + build_sub_path)
308 309
309 use_analyze = self.__config['use_analyze'] 310 use_analyze = self.__config['use_analyze']
310 if (use_analyze and 311 if (use_analyze and
311 self.compiler == 'ninja' and 312 self.compiler == 'ninja' and
312 self.m.tryserver.is_tryserver and 313 self.m.tryserver.is_tryserver and
313 'without patch' not in suffix): 314 'without patch' not in suffix):
314 affected_files = self.m.tryserver.get_files_affected_by_patch() 315 affected_files = self.m.tryserver.get_files_affected_by_patch()
315 # The same test may be configured to run on multiple simulators. 316 # The same test may be configured to run on multiple simulators.
316 # Only specify each test once for the analyzer. 317 # Only specify each test once for the analyzer.
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 self.configuration, 493 self.configuration,
493 'iossim', 494 'iossim',
494 ), 495 ),
495 'ninja': self.m.path.join( 496 'ninja': self.m.path.join(
496 'src', 497 'src',
497 build_dir, 498 build_dir,
498 '%s-%s' % (self.configuration, platform), 499 '%s-%s' % (self.configuration, platform),
499 'iossim', 500 'iossim',
500 ), 501 ),
501 }[self.compiler] 502 }[self.compiler]
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipes/webrtc/ios.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698