Add new chromium recipe builder to chromium.perf

scripts/slave/recipe_modules/chromium_tests/chromium_perf.py

 # Copyright 2015 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.
 
 import collections
 
 from . import steps
 
 import DEPS
 CHROMIUM_CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
@@ skipping 94 matching lines @@
 
 def _AddBuildSpec(
   name, platform, target_bits=64, add_to_bisect=False, enable_swarming=False):
   if target_bits == 64:
     perf_id = platform
   else:
     perf_id = '%s-%d' % (platform, target_bits)
 
   SPEC['builders'][name] = BuildSpec(
       'chromium_perf', perf_id, platform, target_bits, enable_swarming)
-  assert target_bits not in builders[platform]
-  builders[platform][target_bits] = name
+
+  # TODO(martiniss): re-enable assertion once android has switched to the
+  # chromium recipe
+  # assert target_bits not in builders[platform]
+
+  if not builders[platform].get(target_bits, None):
+    builders[platform][target_bits] = name
   if add_to_bisect:
     SPEC['settings']['bisect_builders'].append(name)
 
 
 def _AddTestSpec(name, perf_id, platform, target_bits=64,
                  num_host_shards=1, num_device_shards=1):
   for shard_index in xrange(num_host_shards):
     builder_name = '%s (%d)' % (name, shard_index + 1)
     tests = [steps.DynamicPerfTests(
         perf_id, platform, target_bits, num_device_shards=num_device_shards,
         num_host_shards=num_host_shards, shard_index=shard_index)]
     SPEC['builders'][builder_name] = TestSpec(
         'chromium_perf', perf_id, platform, target_bits, tests=tests)
 
 
 _AddBuildSpec('Android Builder', 'android', target_bits=32)
+_AddBuildSpec('Android Temporary Compile', 'android', target_bits=32)
 _AddBuildSpec('Android arm64 Builder', 'android')
 _AddBuildSpec('Win Builder', 'win', target_bits=32)
 _AddBuildSpec( \
   'Win x64 Builder', 'win', add_to_bisect=True, enable_swarming=True)
 _AddBuildSpec('Mac Builder', 'mac', add_to_bisect=True)
 _AddBuildSpec('Linux Builder', 'linux', add_to_bisect=True)
 
 
 _AddTestSpec('Android Galaxy S5 Perf', 'android-galaxy-s5', 'android',
              target_bits=32, num_device_shards=7, num_host_shards=3)
@@ skipping 36 matching lines @@
 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac',
              num_host_shards=5)
 
 
 _AddTestSpec('Linux Perf', 'linux-release', 'linux',
              num_host_shards=5)