Remove skia_arch_width, fold into skia_arch_type.

gyp/common_conditions.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
@@ skipping 143 matching lines @@
                 'inherit_from': ['Release_Developer'],
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                      # Don't specify /arch. SSE2 is implied by 64bit and specifying it warns.
                     'EnableEnhancedInstructionSet': '0', #
                   },
                 },
               },
             },
           }],
-          [ 'skia_arch_width == 64', {
+          [ 'skia_arch_type == "x86_64"', {
             'msvs_configuration_platform': 'x64',
           }],
-          [ 'skia_arch_width == 32', {
+          [ 'skia_arch_type == "x86"', {
             'msvs_configuration_platform': 'Win32',
           }],
           [ 'skia_warnings_as_errors', {
             'msvs_settings': {
               'VCCLCompilerTool': {
                 'WarnAsError': 'true',
                 'AdditionalOptions': [
                   '/we4189', # initialized but unused var warning
                 ],
               },
@@ skipping 109 matching lines @@
                   'SK_ARM_HAS_OPTIONAL_NEON',
                 ],
               }],
               [ 'skia_os != "chromeos" and skia_os != "linux"', {
                 'cflags': [
                   '-mfloat-abi=softfp',
                 ],
               }],
             ],
           }],
-          [ 'skia_arch_type == "mips"', {
+          [ '"mips" in skia_arch_type', {
             'cflags': [
               '-EL',
             ],
             'conditions': [
               [ 'mips_arch_variant == "mips32r2"', {
                 'cflags': [
                   '-march=mips32r2',
                 ],
                 'conditions': [
                   [ 'mips_dsp == 1', {
@@ skipping 180 matching lines @@
           },
           'Release': {
             'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', },
             'defines': [ 'NDEBUG' ],
           },
         },
         'xcode_settings': {
           'conditions': [
             [ 'skia_fast', { 'WARNING_CFLAGS': [ '<@(skia_fast_flags)' ] } ],
             [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }],
-            [ 'skia_arch_width == 32', { 'ARCHS': ['i386']   }],
-            [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }],
+            [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386']   }],
+            [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
             [ 'skia_osx_deployment_target==""', {
               'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld.
             }, {
               'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
             }],
           ],
           'CLANG_CXX_LANGUAGE_STANDARD':               'c++11',
           'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',  # -mssse3
           'GCC_SYMBOLS_PRIVATE_EXTERN':                'NO',   # -fvisibility=hidden
           'GCC_INLINES_ARE_PRIVATE_EXTERN':            'NO',   # -fvisibility-inlines-hidden
@@ skipping 117 matching lines @@
         # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
       ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }