Switch Android Compile to the chromium recipe

masters/master.chromium.perf/master.cfg

 # Copyright 2012 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.
 
 # This is the buildmaster config file for the 'chromium.perf' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
 # 'mktap buildbot master').
 
 # It has one job: define a dictionary named BuildmasterConfig. This
@@ skipping 98 matching lines @@
 
 
 _category_index = enumerate(
     ('builders', 'android', 'win', 'mac', 'linux'))
 _category_index = {category: index + 1 for index, category in _category_index}
 def _CategoryIndex(category):
   return _category_index[category]
 
 
 _builder_names = []
-def _AddBuilder(name, platform, timeout=None, target_bits=64):
+def _AddBuilder(name, platform, recipe=None, timeout=None, target_bits=64):
   if platform == 'android':
     factory = recipe_factory
-    recipe = 'android/builder'
+    recipe = recipe or 'android/builder'
     bb_trigger = True

[ghost stip (do not use), 2016/10/28 18:42:22]

once we convert everything, we can delete this whole bb_trigger stuff

[dtu, 2016/10/28 19:08:58]

:)

   else:
     factory = m_remote_run_chromium_src
-    recipe = 'chromium'
+    recipe = recipe or 'chromium'
     bb_trigger = False
 
   factory_kwargs = dict(
     recipe=recipe,
   )
   if timeout:
     factory_kwargs['timeout'] = timeout
   if bb_trigger:
     factory_kwargs['triggers'] = [_TriggerName(platform, target_bits)]
 
@@ skipping 37 matching lines @@
     for index in xrange(num_shards):
       indexed_name = '%s (%d)' % (name, index + 1)
       _AddTesterShard(
           indexed_name, factory, platform, target_bits, bb_trigger=bb_trigger)
 
 
 c['builders'] = []
 
 
 _AddBuilder('Android Builder', 'android', target_bits=32)
-_AddBuilder('Android Compile', 'android', target_bits=32)
+_AddBuilder('Android Compile', 'android', target_bits=32, recipe='chromium')
 _AddBuilder('Android arm64 Builder', 'android')
 _AddBuilder('Win Builder', 'win', timeout=3600, target_bits=32)
 # TODO(dtu): decrease the timeout when https://crbug.com/617982 is fixed.
 _AddBuilder('Win x64 Builder', 'win', timeout=7200)
 _AddBuilder('Mac Builder', 'mac')
 # TODO(krasin): decrease the timeout when https://crbug.com/569732 is fixed.
 _AddBuilder('Linux Builder', 'linux', timeout=4800)
 
 
 _AddTester('Android Galaxy S5 Perf', 'android', num_shards=3, target_bits=32)
@@ skipping 92 matching lines @@
 
 ####### PROJECT IDENTITY
 
 # the 'projectName' string will be used to describe the project that this
 # buildbot is working on. For example, it is used as the title of the
 # waterfall HTML page. The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url