Add split builder/tester android trybot target

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index 30d24e64ecb5dfa73f06633d77a96244e4a53ebd..a7eee4994a0f33ecaed86816d7300effc9925f3a 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -7,6 +7,8 @@
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
+from buildbot.scheduler import Triggerable
+
 # These modules come from scripts, which must be in the PYTHONPATH.
 from master import master_utils
 from master import slaves_list
@@ -82,10 +84,9 @@ def CreateBuilder(platform, builder_name, target,
                   tests=None, options=None, mode=None, timeout=2400,
                   slavebuilddir=None, extra_gyp_defines=None,
                   gclient_env=None, gyp_generators=None,
-                  factory_properties=None):
+                  factory_properties=None, annotation_script=None):
   """Generates and register a builder along with its slave(s)."""
-  if platform not in ('win32', 'win64', 'linux', 'mac',
-                      'android', 'android_test'):
+  if platform not in ('win32', 'win64', 'linux', 'mac', 'android'):
     raise Exception(platform + ' is not a known os type')
 
   factory_properties = (factory_properties or {}).copy()
@@ -100,7 +101,6 @@ def CreateBuilder(platform, builder_name, target,
     ])
   factory_properties['gclient_env'] = {'GYP_DEFINES': ''}
 
-  annotation_script = None
   project = None
   if platform in ('win32', 'win64'):
     factory = m_chromium_win
@@ -123,10 +123,6 @@ def CreateBuilder(platform, builder_name, target,
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
   elif platform == 'android':
     factory = m_chromium_android
-    annotation_script = 'src/build/android/buildbot_try_compile.sh'
-  elif platform == 'android_test':
-    factory = m_chromium_android
-    annotation_script = 'src/build/android/buildbot_try_compile_test.sh'
   elif platform == 'mac':
     factory = m_chromium_mac
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
@@ -611,13 +607,35 @@ b_chromium_chromiumos = {
                           ' proprietary_codecs=1')}})
 }
 
-b_android = CreateBuilder(platform='android',
-                          target='Release',
-                          builder_name='android')
+# Compile only trybot
+b_android = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android',
+    annotation_script='src/build/android/buildbot_try_compile.sh')
 
-b_android_test = CreateBuilder(platform='android_test',
-                               target='Release',
-                               builder_name='android_test')
+# Compile and run tests
+b_android_test = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android_test',
+    annotation_script='src/build/android/buildbot_try_compile_test.sh')
+
+# Compile and zip build, triggers android_tester
+b_android_builder = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android_builder',
+    factory_properties={'trigger': 'android'},
+    annotation_script='src/build/android/buildbot_try_builder.sh')
+
+# Download and extract build, run tests.
+b_android_tester = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android_tester',
+    factory_properties={'halt_on_missing_build': True},
+    annotation_script='src/build/android/buildbot_try_tester.sh')
 
 # 32 bits tools can't link libwebcore.a anymore due to lack of virtual address
 # space, including OSX 10.5.
@@ -1331,7 +1349,8 @@ arm_gclient_env = {
 c['builders'] = [
   b_linux_rel, b_linux_rel_alt, b_mac_rel, b_win_rel,
   b_linux_clang,
-  b_linux, b_mac, b_win, b_android, b_android_test,
+  b_linux, b_mac, b_win,
+  b_android, b_android_test, b_android_builder, b_android_tester,
   b_win_vs2010_rel, b_win_vs2010,
   b_chromium_chromiumos,
   b_valgrind_linux, b_valgrind_mac,
@@ -1412,6 +1431,10 @@ if LISTEN_TO_SVN:
       code_review_sites=code_review_sites,
       pools=pools))
 
+# Triggerable scheduler for Android Builder.
+c['schedulers'].append(Triggerable(
+    name='android',
+    builderNames=['android_tester']))
 
 ####### STATUS TARGETS