Chromium -> Mojo roll.

skia/skia_library_opts.gyp

 # Copyright 2013 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.
 
 # This gyp file contains the platform-specific optimizations for Skia
 {
   'variables': {
       'skia_src_path': '../third_party/skia/src',
       'includes': [ '../third_party/skia/gyp/opts.gypi' ],
       'include_dirs': [
@@ skipping 46 matching lines @@
         [ 'target_arch != "arm" and target_arch != "mipsel" and \
            target_arch != "arm64" and target_arch != "mips64el"', {
           'sources': [ '<@(sse2_sources)' ],
           'dependencies': [
             'skia_opts_ssse3',
             'skia_opts_sse41',
           ],
         }],
         [ 'target_arch == "arm"', {
           'conditions': [
+            [ 'arm_version >= 7', {
+              'sources': [ '<@(armv7_sources)' ],
+            }, {  # arm_version < 7
+              'sources': [ '<@(none_sources)' ],
+            }],
             [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
               'dependencies': [
                 'skia_opts_neon',
               ]
-           }],
+            }],
           ],
           # The assembly uses the frame pointer register (r7 in Thumb/r11 in
           # ARM), the compiler doesn't like that. Explicitly remove the
           # -fno-omit-frame-pointer flag for Android, as that gets added to all
           # targets via common.gypi.
           'cflags!': [
             '-fno-omit-frame-pointer',
             '-marm',
             '-mapcs-frame',
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
         }],
-        [ 'target_arch == "arm" and arm_version < 7', {
-          'sources': [ '<@(none_sources)' ],
+        [ 'target_arch == "mipsel"',{
+          'cflags': [ '-fomit-frame-pointer' ],
+          'conditions': [
+            [ 'mips_dsp_rev >= 1', {
+              'sources': [ '<@(mips_dsp_sources)' ],
+            }, {  # mips_dsp_rev == 0
+              'sources': [ '<@(none_sources)' ],
+            }],
+          ],
         }],
-        [ 'target_arch == "arm" and arm_version >= 7', {
-          'sources': [ '<@(armv7_sources)' ],
-        }],
-        [ 'target_arch == "mipsel" or target_arch == "mips64el"',{
+        [ 'target_arch == "mips64el"',{
           'cflags': [ '-fomit-frame-pointer' ],
           'sources': [ '<@(none_sources)' ],
         }],
         [ 'target_arch == "arm64"', {
           'sources': [ '<@(arm64_sources)' ],
         }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we have to
     # create another target specifically for SSSE3 code as we would not want
@@ skipping 108 matching lines @@
           'ldflags': [
             '-march=armv7-a',
             '-Wl,--fix-cortex-a8',
           ],
           'sources': [ '<@(neon_sources)' ],
         },
       ],
     }],
   ],
 }