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

Unified Diff: build/android/buildbot/bb_host_steps.py

Issue 1867063002: Revert of [Android] Switch chromium.gpu bots to mb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | build/android/buildbot/bb_run_bot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/buildbot/bb_host_steps.py
diff --git a/build/android/buildbot/bb_host_steps.py b/build/android/buildbot/bb_host_steps.py
index c0b167a668ff522e245a036491c4bacef6976661..11f5032aa8665879821d0d0b2416066ffc892ce2 100755
--- a/build/android/buildbot/bb_host_steps.py
+++ b/build/android/buildbot/bb_host_steps.py
@@ -50,24 +50,8 @@
RunCmd(['gclient', 'runhooks'], halt_on_failure=True)
-def GenerateBuildFiles(options):
- cmd = [SrcPath('tools', 'mb', 'mb.py'),
- 'gen',
- '-m', options.build_properties['mastername'],
- '-b', options.build_properties['buildername'],
- '//out/%s' % options.target]
- bb_annotations.PrintNamedStep('generate_build_files')
- RunCmd(cmd, halt_on_failure=True)
-
-
def Compile(options):
- if options.run_mb:
- os.environ['GYP_CHROMIUM_NO_ACTION'] = '1'
- RunHooks(options.target)
- GenerateBuildFiles(options)
- else:
- RunHooks(options.target)
-
+ RunHooks(options.target)
cmd = [os.path.join(SLAVE_SCRIPTS_DIR, 'compile.py'),
'--build-tool=ninja',
'--compiler=goma',
@@ -127,8 +111,6 @@
parser.add_option('--extra_src', default='',
help='Path to extra source file. If this is supplied, '
'bisect script will use it to override default behavior.')
- parser.add_option('--run-mb', action='store_true',
- help='Use mb to generate build files.')
return parser
« no previous file with comments | « no previous file | build/android/buildbot/bb_run_bot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698