ARM Skia NEON patches - 14bis - Fix optional NEON on Linux

gyp/core.gyp

Index: gyp/core.gyp
diff --git a/gyp/core.gyp b/gyp/core.gyp
index bebcad6f98d0d861ab7c4c575e5ac8a38b6e8819..4185f2ca0efbd4ee56d99f346e1b90cfa6003ac3 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -81,12 +81,19 @@
             '../src/core/SkPaintOptionsAndroid.cpp',
           ],
         }],
-        [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {
-          # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
-          'sources': [
-            '../src/core/SkPaintOptionsAndroid.cpp',
-            '../src/core/SkUtilsArm.cpp',
-            '../src/core/SkUtilsArm.h',
+        [ 'skia_arch_type == "arm" and armv7 == 1', {
+          'conditions': [
+            ['skia_os in ["android", "linux"]', {
+              'sources': [
+                '../src/core/SkUtilsArm.cpp',
+                '../src/core/SkUtilsArm.h',
+              ],
+            }],
+            ['skia_os == "android"', {
+              'sources': [
+                '../src/core/SkPaintOptionsAndroid.cpp',
+              ],
+            }],
           ],
         }],
         ['skia_gpu == 1', {