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

Unified Diff: scripts/slave/recipe_modules/ios/api.py

Issue 1886813005: Fix uncaught exception on ios_dbg_simulator_ninja bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/ios/api.py
diff --git a/scripts/slave/recipe_modules/ios/api.py b/scripts/slave/recipe_modules/ios/api.py
index 272d727c0abd14ca17cfbfd0ee8f375bf2606de2..b1e480347085f5f1b6a0b7875b9bdba9a898772d 100644
--- a/scripts/slave/recipe_modules/ios/api.py
+++ b/scripts/slave/recipe_modules/ios/api.py
@@ -333,9 +333,15 @@ class iOSApi(recipe_api.RecipeApi):
use_goma = (self.compiler == 'ninja' and
('use_goma=1' in gyp_defines or 'use_goma=true' in gn_args))
if use_goma:
- self.m.chromium.apply_config('ninja')
- self.m.chromium.apply_config('default_compiler')
- self.m.chromium.apply_config('goma')
+ if 'without patch' not in suffix:
+ # TODO(crbug.com/603641):
+ # Configs aren't deapplied, so we only want to apply these
+ # configs once. Really, we should refactor this so that we're
+ # not applying configs at all in build(), but rather do it
+ # in an earlier step.
+ self.m.chromium.apply_config('ninja')
+ self.m.chromium.apply_config('default_compiler')
+ self.m.chromium.apply_config('goma')
smut 2016/04/15 01:43:12 Could apply these in read_build_config.
Dirk Pranke 2016/04/15 01:46:20 I thought about that but I would have to make sure
self.m.chromium.compile(targets=compile_targets,
target=build_sub_path,
cwd=cwd)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698