Update slave scripts to set skia_arch_type but not skia_arch_width

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.
 
 import os
 import sys
 
 from recipe_engine.config import config_item_context, ConfigGroup
 from recipe_engine.config import Dict, Set, Single, Static
 from recipe_engine.config_types import Path
@@ skipping 37 matching lines @@
   env = {}
   if builder_dict.get('compiler') == 'Clang':
     env['CC'] = '/usr/bin/clang'
     env['CXX'] = '/usr/bin/clang++'
   return env
 
 
 def gyp_defs_from_builder_dict(builder_dict):
   gyp_defs = {}
 
-  # skia_arch_width.
+  # skia_arch_type.
   if builder_dict['role'] == builder_name_schema.BUILDER_ROLE_BUILD:
     arch = builder_dict['target_arch']
   elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_HOUSEKEEPER:
     arch = None
   else:
     arch = builder_dict['arch']
 
-  #TODO(scroggo + mtklein): when safe, only set skia_arch_type
-  arch_widths_and_types = {
-    'x86':      ('32', 'x86'),
-    'x86_64':   ('64', 'x86_64'),
-    'Arm7':     ('32', 'arm'),
-    'Arm64':    ('64', 'arm64'),
-    'Mips':     ('32', 'mips'),
-    'Mips64':   ('64', 'mips'),
-    'MipsDSP2': ('32', 'mips'),
+  arch_types = {
+    'x86':      'x86',
+    'x86_64':   'x86_64',
+    'Arm7':     'arm',
+    'Arm64':    'arm64',
+    'Mips':     'mips32',
+    'Mips64':   'mips64',
+    'MipsDSP2': 'mips32',
   }
-  if arch in arch_widths_and_types:
-    skia_arch_width, skia_arch_type = arch_widths_and_types[arch]
-    gyp_defs['skia_arch_width'] = skia_arch_width
-    gyp_defs['skia_arch_type']  = skia_arch_type
+  if arch in arch_types:
+    gyp_defs['skia_arch_type']  = arch_types[arch]
 
   # housekeeper: build shared lib.
   if builder_dict['role'] == builder_name_schema.BUILDER_ROLE_HOUSEKEEPER:
     gyp_defs['skia_shared_lib'] = '1'
 
   # skia_gpu.
   if builder_dict.get('cpu_or_gpu') == 'CPU':
     gyp_defs['skia_gpu'] = '0'
 
   # skia_warnings_as_errors.
@@ skipping 108 matching lines @@
                      (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.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'