Skia recipes: Move Android and ChromeOS config info in from slaves.cfg

scripts/slave/recipe_modules/skia/android_flavor.py

 # Copyright 2014 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
 import config
 import copy
 import default_flavor
 
 
 """Android flavor utils, used for building for and running tests on Android."""
 
 
+DEFAULT_SDK_ROOT = '/home/chrome-bot/android-sdk-linux'
+
+SlaveInfo = collections.namedtuple('SlaveInfo',
+                                   'serial android_sdk_root has_root')
+
+SLAVE_INFO = {
+  'skiabot-shuttle-ubuntu12-galaxys3-001':
+      SlaveInfo('4df713b8244a21cf', DEFAULT_SDK_ROOT, False),
+  'skiabot-shuttle-ubuntu12-galaxys3-002':
+      SlaveInfo('32309a56e9b3a09f', DEFAULT_SDK_ROOT, False),
+  'skiabot-shuttle-ubuntu12-galaxys4-001':
+      SlaveInfo('4d0032a5d8cb6125', DEFAULT_SDK_ROOT, False),
+  'skiabot-shuttle-ubuntu12-galaxys4-002':
+      SlaveInfo('4d00353cd8ed61c3', DEFAULT_SDK_ROOT, False),
+  'skiabot-shuttle-ubuntu12-nexus5-001':
+      SlaveInfo('03f61449437cc47b', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus5-002':
+      SlaveInfo('018dff3520c970f6', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus7-001':
+      SlaveInfo('015d210a13480604', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus7-002':
+      SlaveInfo('015d18848c280217', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus7-003':
+      SlaveInfo('015d16897c401e17', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus9-001':
+      SlaveInfo('HT43RJT00022', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus9-002':
+      SlaveInfo('HT4AEJT03112', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus9-003':
+      SlaveInfo('HT4ADJT03339', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus10-001':
+      SlaveInfo('R32C801B5LH', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexus10-003':
+      SlaveInfo('R32CB017X2L', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexusplayer-001':
+      SlaveInfo('D76C708B', DEFAULT_SDK_ROOT, True),
+  'skiabot-shuttle-ubuntu12-nexusplayer-002':
+      SlaveInfo('8AB5139A', DEFAULT_SDK_ROOT, True),
+  'default':
+      SlaveInfo('noserial', DEFAULT_SDK_ROOT, False),
+}
+
+
 def device_from_builder_dict(builder_dict):
   """Given a builder name dictionary, return an Android device name."""
   if 'Android' in builder_dict.get('extra_config', ''):
     if 'NoNeon' in builder_dict['extra_config']:
       return 'arm_v7'  # pragma: no cover
     return {
       'Arm64': 'arm64',
       'x86': 'x86',
       'x86_64': 'x86_64',
       'Mips': 'mips',
@@ skipping 41 matching lines @@
 
   def __call__(self, *args, **kwargs):
     self.maybe_wait_for_device()
     return self._adb(*args, **kwargs)
 
 
 class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, skia_api):
     super(AndroidFlavorUtils, self).__init__(skia_api)
     self.device = device_from_builder_dict(self._skia_api.c.builder_cfg)
-    self.serial = self._skia_api.c.slave_cfg.get('serial')
+    slave_info = SLAVE_INFO.get(self._skia_api.c.SLAVE_NAME,
+                                SLAVE_INFO['default'])
+    self.serial = slave_info.serial
     self.android_bin = self._skia_api.m.path['slave_build'].join(
         'skia', 'platform_tools', 'android', 'bin')
-    self._android_sdk_root = self._skia_api.c.slave_cfg['android_sdk_root']
+    self._android_sdk_root = slave_info.android_sdk_root
     self._adb = _ADBWrapper(
         self._skia_api.m.adb,
         self._skia_api.m.path.join(self._android_sdk_root,
                                    'platform-tools', 'adb'),
         self.serial)
-    self._has_root = self._skia_api.c.slave_cfg.get('has_root', True)
+    self._has_root = slave_info.has_root
     self._default_env = {'ANDROID_SDK_ROOT': self._android_sdk_root,
                          'SKIA_ANDROID_VERBOSE_SETUP': 1}
 
   def step(self, name, cmd, **kwargs):
     self._adb.maybe_wait_for_device()
     args = [self.android_bin.join('android_run_skia'),
             '--logcat',
             '-d', self.device,
             '-s', self.serial,
     ]
@@ skipping 132 matching lines @@
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dirs=default_flavor.SKPDirs(
             prefix + 'skp', self._skia_api.c.BUILDER_NAME, '/'),
         skp_perf_dir=prefix + 'skp_perf',
         tmp_dir=prefix + 'tmp_dir')