[Android] Use ensure_goma in android/builder.

scripts/slave/recipes/android/builder.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from contextlib import contextmanager
 from recipe_engine import recipe_api
 from recipe_engine.types import freeze
 
 DEPS = [
   'chromium',
   'chromium_android',
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/step',
   'trigger',
   'depot_tools/tryserver',
 ]
 
 @contextmanager
 def FYIStep():
   try:
     yield
   except recipe_api.StepFailure:
     pass
 
 BUILDERS = freeze({
-  'chromium.android': {

[eakuefner, 2016/07/21 22:06:32]

what's all this?

[jbudorick, 2016/07/21 22:38:16]

backed out everything but the ensure_goma call.

-    'Android x64 Builder (dbg)': {
-      'recipe_config': 'x64_builder_mb',
-      'check_licenses': FYIStep,
-      'gclient_apply_config': ['android', 'chrome_internal'],
-    },
-    'Android x86 Builder (dbg)' : {
-      'recipe_config': 'x86_builder_mb',
-      'check_licenses': FYIStep,
-      'gclient_apply_config': ['android', 'chrome_internal'],
-    },
-    'Android MIPS Builder (dbg)': {
-      'recipe_config': 'mipsel_builder_mb',
-      'check_licenses': FYIStep,
-      'gclient_apply_config': ['android', 'chrome_internal'],
-    },
-  },
   'chromium.perf': {
     'Android Builder': {
       'recipe_config': 'main_builder_rel_mb',
       'gclient_apply_config': ['android', 'perf'],
       'kwargs': {
         'BUILD_CONFIG': 'Release',
       },
       'upload': {
         'bucket': 'chrome-perf',
         'path': lambda api: ('android_perf_rel/full-build-linux_%s.zip'
@@ skipping 134 matching lines @@
     # dynamically set to either:
     # (1) 'revision' from the waterfall, or
     # (2) 'HEAD' for forced builds with unspecified 'revision'.
     component_rev = revision
     dep = bot_config.get('set_component_rev')
     api.gclient.c.revisions[dep['name']] = dep['rev_str'] % component_rev
 
   api.bot_update.ensure_checkout()
   api.chromium_android.clean_local_files()
 
+  api.chromium.ensure_goma()
   api.chromium.runhooks()
 
   if bot_config.get('run_mb'):
     api.chromium.run_mb(mastername, buildername, use_goma=True)
 
   if bot_config.get('check_licenses'):
     with bot_config['check_licenses']():
       droid.check_webview_licenses()
   api.chromium.compile(bot_config.get('targets'))
 
@@ skipping 33 matching lines @@
                                  _sanitize_nonalpha(buildername))) +
         api.properties.generic(buildername=buildername,
             repository='svn://svn.chromium.org/chrome/trunk/src',
             buildnumber=257,
             mastername=mastername,
             issue='8675309',
             patchset='1',
             revision='267739',
             got_revision='267739'))
 
-  def step_failure(mastername, buildername, steps, tryserver=False):

[eakuefner, 2016/07/21 22:06:33]

?

-    props = api.properties.tryserver if tryserver else api.properties.generic
-    return (
-      api.test('%s_%s_fail_%s' % (
-        _sanitize_nonalpha(mastername),
-        _sanitize_nonalpha(buildername),
-        '_'.join(_sanitize_nonalpha(step) for step in steps))) +
-      props(mastername=mastername, buildername=buildername) +
-      reduce(lambda a, b: a + b,
-             (api.step_data(step, retcode=1) for step in steps))
-    )
-
-  yield step_failure(mastername='chromium.android',
-                     buildername='Android x64 Builder (dbg)',
-                     steps=['check licenses'])
-