Remove skia_arch_width, fold into skia_arch_type.

gyp/libjpeg-turbo.gyp

 # 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.
 
 {
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
   'variables': {
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/libjpeg-turbo',
@@ skipping 176 matching lines @@
                 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm.c',
                 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm_neon.S',
               ],
             }, {
               'sources': [
                 '../third_party/externals/libjpeg-turbo/jsimd_none.c',
               ],
             }],
           ],
         }],
-        [ 'skia_arch_type == "mips"', {
-          'conditions': [
-            [ 'skia_arch_width == 64', {
-              'sources': [
-                '../third_party/externals/libjpeg-turbo/simd/jsimd_mips.c',
-                '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2_asm.h',
-                '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2.S',
-              ],
-            }, {
-              'sources': [
-                '../third_party/externals/libjpeg-turbo/jsimd_none.c',
-              ],
-            }],
+        [ 'skia_arch_type == "mips64"', {

[mtklein, 2015/07/09 16:29:57]

This is a lot nicer.

+          'sources': [
+            '../third_party/externals/libjpeg-turbo/simd/jsimd_mips.c',
+            '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2_asm.h',
+            '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2.S',
+          ],
+        }],
+        [ 'skia_arch_type == "mips32"', {
+          'sources': [
+            '../third_party/externals/libjpeg-turbo/jsimd_none.c',
           ],
         }],
       
         # Build rules for an asm file.
         # On Windows, we use the precompiled yasm binary.
         # On Linux, we build our patched yasm and use it except when use_system_yasm is 1.
         # On Mac, we always build our patched yasm and use it.
         [ 'skia_os == "win"', {
           'variables': {
             'yasm_path': '../third_party/externals/yasm/binaries/win/yasm.exe',
@@ skipping 115 matching lines @@
               ],
               'process_outputs_as_sources': 1,
               'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
             }],
           ]
         },
       ],
     },
   ],
 }