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

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

Issue 2152453003: recipes: Stop passing --build-tool=ninja to compile.py (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Created 4 years, 5 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/example.expected/basic_out_dir.json » ('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 re 5 import re
6 6
7 from recipe_engine import recipe_api 7 from recipe_engine import recipe_api
8 from recipe_engine import util as recipe_util 8 from recipe_engine import util as recipe_util
9 9
10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder): 10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 # Use explicit goma deps cache dir if it's set in the path config. 179 # Use explicit goma deps cache dir if it's set in the path config.
180 # Otherwise use the default one inside build output directory. 180 # Otherwise use the default one inside build output directory.
181 try: 181 try:
182 args.extend(['--goma-deps-cache-dir', self.m.path['goma_deps_cache']]) 182 args.extend(['--goma-deps-cache-dir', self.m.path['goma_deps_cache']])
183 except KeyError: 183 except KeyError:
184 pass 184 pass
185 185
186 if self.c.compile_py.build_args: 186 if self.c.compile_py.build_args:
187 args += ['--build-args', self.c.compile_py.build_args] 187 args += ['--build-args', self.c.compile_py.build_args]
188 # TODO(thakis): Stop passing --build-tool, there is just one.
189 args += ['--build-tool', 'ninja']
190 if self.m.properties.get('build_data_dir'): 188 if self.m.properties.get('build_data_dir'):
191 args += ['--build-data-dir', self.m.properties.get('build_data_dir')] 189 args += ['--build-data-dir', self.m.properties.get('build_data_dir')]
192 if self.c.compile_py.compiler: 190 if self.c.compile_py.compiler:
193 args += ['--compiler', self.c.compile_py.compiler] 191 args += ['--compiler', self.c.compile_py.compiler]
194 if 'goma' in self.c.compile_py.compiler: 192 if 'goma' in self.c.compile_py.compiler:
195 args += [ 193 args += [
196 '--goma-jsonstatus', self.m.json.output(), 194 '--goma-jsonstatus', self.m.json.output(),
197 '--goma-service-account-json-file', 195 '--goma-service-account-json-file',
198 self.m.goma.service_account_json_path, 196 self.m.goma.service_account_json_path,
199 ] 197 ]
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 })) 771 }))
774 772
775 def get_annotate_by_test_name(self, test_name): 773 def get_annotate_by_test_name(self, test_name):
776 return 'graphing' 774 return 'graphing'
777 775
778 def download_lto_plugin(self): 776 def download_lto_plugin(self):
779 return self.m.python( 777 return self.m.python(
780 name='download LTO plugin', 778 name='download LTO plugin',
781 script=self.m.path['checkout'].join( 779 script=self.m.path['checkout'].join(
782 'build', 'download_gold_plugin.py')) 780 'build', 'download_gold_plugin.py'))
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium/example.expected/basic_out_dir.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698