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

scripts/slave/recipe_modules/skia/config.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.
 
 from slave.recipe_config import config_item_context, ConfigGroup
 from slave.recipe_config import Dict, Set, Single, Static
 from slave.recipe_config_types import Path
-from slave.skia import slaves_cfg
 from common.skia import builder_name_schema
 
 
 CONFIG_DEBUG = 'Debug'
 CONFIG_RELEASE = 'Release'
 VALID_CONFIGS = (CONFIG_DEBUG, CONFIG_RELEASE)
 
 
 def BaseConfig(BUILDER_NAME, MASTER_NAME, SLAVE_NAME, **_kwargs):
   equal_fn = lambda tup: ('%s=%s' % tup)
   return ConfigGroup(
     BUILDER_NAME = Static(str(BUILDER_NAME)),
     MASTER_NAME = Static(str(MASTER_NAME)),
     SLAVE_NAME = Static(str(SLAVE_NAME)),
     build_targets = Single(list),
     builder_cfg = Single(dict),
     configuration = Single(str),
     do_test_steps = Single(bool),
     do_perf_steps = Single(bool),
     extra_env_vars = Single(dict),
     gyp_env = ConfigGroup(
       GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)),
     ),
     is_trybot = Single(bool),
     role = Single(str),
-    slave_cfg = Single(dict)
   )
 
 
 VAR_TEST_MAP = {
   'BUILDER_NAME': (u'Build-Ubuntu-GCC-x86_64-Debug',
                    u'Build-Ubuntu-GCC-x86_64-Release-Mesa',
                    u'Build-Win-MSVC-x86-Release',
                    u'Build-Win-MSVC-x86-Debug-Exceptions',
                    u'Housekeeper-PerCommit',
                    u'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
@@ skipping 53 matching lines @@
   if builder_dict.get('cpu_or_gpu') == 'CPU':
     gyp_defs['skia_gpu'] = '0'
 
   # skia_warnings_as_errors.
   werr = False
   if builder_dict['role'] == builder_name_schema.BUILDER_ROLE_BUILD:
     if 'Win' in builder_dict.get('os', ''):  # pragma: no cover
       if not ('GDI' in builder_dict.get('extra_config', '') or
               'Exceptions' in builder_dict.get('extra_config', '')):
         werr = True
-    elif 'Mac' in builder_dict.get('os', ''):
-      if 'iOS' in builder_dict.get('extra_config', ''):  # pragma: no cover
-        werr = True
     else:
       werr = True
   gyp_defs['skia_warnings_as_errors'] = str(int(werr))  # True/False -> '1'/'0'
 
   # Win debugger.
   if 'Win' in builder_dict.get('os', ''):
     gyp_defs['skia_win_debuggers_path'] = 'c:/DbgHelp'
 
   # Qt SDK (Win).
   if 'Win' in builder_dict.get('os', ''):
@@ skipping 21 matching lines @@
     gyp_defs['skia_os'] = 'ios'  # pragma: no cover
 
   # Shared library build.
   if builder_dict.get('extra_config') == 'Shared':
     gyp_defs['skia_shared_lib'] = '1'  # pragma: no cover
 
   # PDF viewer in GM.
   if (builder_dict.get('os') == 'Mac10.8' and
       builder_dict.get('arch') == 'x86_64' and
       builder_dict.get('configuration') == 'Release'):
-    gyp_defs['skia_run_pdfviewer_in_gm'] = '1'  # pragma: no cover
+    gyp_defs['skia_run_pdfviewer_in_gm'] = '1'
 
   # Clang.
   if builder_dict.get('compiler') == 'Clang':
     gyp_defs['skia_clang_build'] = '1'  # pragma: no cover
 
   # Valgrind.
   if 'Valgrind' in builder_dict.get('extra_config', ''):
     gyp_defs['skia_release_optimization_level'] = '1'
 
   # Link-time code generation just wastes time on compile-only bots.
@@ skipping 33 matching lines @@
   if c.role == builder_name_schema.BUILDER_ROLE_HOUSEKEEPER:
     c.configuration = CONFIG_RELEASE
   else:
     c.configuration = c.builder_cfg.get('configuration', CONFIG_DEBUG)
   c.do_test_steps = c.role == builder_name_schema.BUILDER_ROLE_TEST
   c.do_perf_steps = (c.role == builder_name_schema.BUILDER_ROLE_PERF or
                      (c.role == builder_name_schema.BUILDER_ROLE_TEST and
                       c.configuration == CONFIG_DEBUG) or
                      'Valgrind' in c.BUILDER_NAME)
   c.gyp_env.GYP_DEFINES.update(gyp_defs_from_builder_dict(c.builder_cfg))
-  c.slave_cfg = slaves_cfg.get(c.MASTER_NAME)[c.SLAVE_NAME]
   c.is_trybot = builder_name_schema.IsTrybot(c.BUILDER_NAME)
   c.extra_env_vars = get_extra_env_vars(c.builder_cfg)
   arch = (c.builder_cfg.get('arch') or c.builder_cfg.get('target_arch'))
   if ('Win' in c.builder_cfg.get('os', '') and arch == 'x86_64'):
     c.configuration += '_x64'