[WIP] support arm_neon_optional flag in blink.

Source/platform/blink_platform.gyp

Index: Source/platform/blink_platform.gyp
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp
index d856e3d4dd75b9e51e5dac1577de06cda9e59d21..3343f2537267d4e7cb36ff62d310bcae3826816c 100644
--- a/Source/platform/blink_platform.gyp
+++ b/Source/platform/blink_platform.gyp
@@ -237,11 +237,6 @@
       # FIXME: Figure out how to store these patterns in a variable.
       ['exclude', '(cf|cg|mac|opentype|win)/'],
       ['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'],
-
-      # *NEON.cpp files need special compile options.
-      # They are moved to the webcore_0_neon target.
-      ['exclude', 'graphics/cpu/arm/.*NEON\\.(cpp|h)'],
-      ['exclude', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'],
     ],
     # Disable c4267 warnings until we fix size_t to int truncations.
     # Disable c4724 warnings which is generated in VS2012 due to improper
@@ -288,6 +283,11 @@
           # implementation.
           ['exclude', 'KillRingNone\\.cpp$'],
 
+          # MACOS is using vDSP_xxx functions for vector math.
+          ['exclude', 'audio/VectorMath\\.cpp$'],
+          ['exclude', 'audio/cpu/arm/VectorMathNEON\\.cpp$'],
+          ['include', 'audio/mac/VectorMathMac\\.cpp$'],
+
           # The Mac build is USE(CF).
           ['include', 'CF\\.cpp$'],
 
@@ -314,7 +314,7 @@
           ['include', 'mac/ThemeMac\\.mm$'],
           ['include', 'mac/WebCoreNSCellExtras\\.h$'],
           ['include', 'mac/WebCoreNSCellExtras\\.mm$'],
- 
+
           # Mac uses only ScrollAnimatorMac.
           ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'],
           ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'],
@@ -425,8 +425,27 @@
         ],
       }],
       ['target_arch=="arm"', {
-        'dependencies': [
-          'blink_arm_neon',
+        'sources/': [
+          # ARM NEON specific functions.
+          ['exclude', 'audio/VectorMath\.cpp$'],
+          ['include', 'audio/cpu/arm/VectorMathNEON\\.cpp$'],
+        ],
+        'conditions': [
+          ['arm_neon == 1 or arm_neon_optional == 1', {
+            'cflags!': [
+              '-mfpu=vfp',
+              '-mfpu=vfpv3-d16',
+            ],
+            'cflags': [
+              '-marm',
+              '-mfpu=neon',
+            ],
+            'conditions': [
+              ['OS=="android"', {
+                'cflags!': ['-mthumb'],
+              }],
+            ],
+          }],
         ],
       }],
     ],
@@ -438,35 +457,5 @@
         ],
       }],
     ],
-  },
-  # The *NEON.cpp files fail to compile when -mthumb is passed. Force
-  # them to build in ARM mode.
-  # See https://bugs.webkit.org/show_bug.cgi?id=62916.
-  {
-    'target_name': 'blink_arm_neon',
-    'conditions': [
-      ['target_arch=="arm"', {
-        'type': 'static_library',
-        'dependencies': [
-          'blink_common',
-        ],
-        'hard_dependency': 1,
-        'sources': [
-          '<@(platform_files)',
-        ],
-        'sources/': [
-          ['exclude', '.*'],
-          ['include', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'],
-        ],
-        'cflags': ['-marm'],
-        'conditions': [
-          ['OS=="android"', {
-            'cflags!': ['-mthumb'],
-          }],
-        ],
-      },{  # target_arch!="arm"
-        'type': 'none',
-      }],
-    ],
   }],
 }