[Android] Use ensure_goma in android/builder.

scripts/slave/recipes/android/builder.py

Index: scripts/slave/recipes/android/builder.py
diff --git a/scripts/slave/recipes/android/builder.py b/scripts/slave/recipes/android/builder.py
index b1f800e951f65ba2fd0b28cb23fc03f8364f5b94..f558129e5cb1d62023f9543fed2b40f9c1b26dc5 100644
--- a/scripts/slave/recipes/android/builder.py
+++ b/scripts/slave/recipes/android/builder.py
@@ -26,23 +26,6 @@ def FYIStep():
     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',
@@ -197,6 +180,7 @@ def _RunStepsInternal(api, mastername, buildername, revision):
   api.bot_update.ensure_checkout()
   api.chromium_android.clean_local_files()
 
+  api.chromium.ensure_goma()
   api.chromium.runhooks()
 
   if bot_config.get('run_mb'):
@@ -250,19 +234,3 @@ def GenTests(api):
             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'])
-