Move Android Nexus 9 GPU bot to chromium.gpu.fyi waterfall.

masters/master.chromium.gpu.fyi/master.cfg

 # Copyright (c) 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.
 
 from buildbot.scheduler import Dependent
 
 from common import chromium_utils
 
 from master import gitiles_poller
 from master import master_config
@@ skipping 49 matching lines @@
 # FACTORIES
 
 m_annotator = annotator_factory.AnnotatorFactory()
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
 recipe_master_helper.AddRecipeBasedBuilders(
   c, slaves, m_annotator, trigger_name_map)
 
+
+# ------------
+# Android bots
+
+# TODO(kbr): finish the conversion of the Android bots to the Chromium
+# recipe, and remove the autogenerated recipes entirely. crbug.com/490984
+F_ANDROID = annotator_factory.AnnotatorFactory().BaseFactory(
+    recipe='chromium.gpu.recipe_autogen')
+
+b_android_nexus9 = {'name': 'Android Debug (Nexus 9)',
+                    'factory': F_ANDROID}
+
+c['builders'] += [ b_android_nexus9 ]
+
+# ------------
+# Audio bots
+
+# TODO(kbr): get the regular GPU bots to run these audio tests on real
+# audio hardware, and decommission these two bots. crbug.com/416594
+
 f_recipe = annotator_factory.AnnotatorFactory().BaseFactory(
     recipe='chromium.gpu.fyi.recipe_autogen')
 
 b_win_audio = {'name': 'Win7 Audio',
                'factory': f_recipe}
 
 b_linux_audio = {'name': 'Linux Audio',
                  'factory': f_recipe}
 
 # Order them by OS type, target type, and OS version.
@@ skipping 19 matching lines @@
 # Buildbot master url:
 # Must come before AutoSetupMaster().
 c['buildbotURL'] = ActiveMaster.buildbot_url
 
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     tagComparator=master_poller.comparator,
     enable_http_status_push=ActiveMaster.is_production_host)