[WIP] support arm_neon_optional flag in blink.

Source/platform/blink_platform.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 219 matching lines @@
       '<(blink_platform_output_dir)/FontFamilyNames.cpp',
       '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp',
       '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h',
       '<(blink_platform_output_dir)/ColorData.cpp',
     ],
     'sources/': [
       # Exclude all platform specific things, reinclude them below on a per-platform basis
       # 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
     # compiler optimizations, see crbug.com/237063
     'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
     'conditions': [
       ['OS=="linux" or OS=="android" or OS=="win"', {
         'sources/': [
           # Cherry-pick files excluded by the broader regular expressions above.
           ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
@@ skipping 26 matching lines @@
         },
         'sources/': [
           # We use LocaleMac.mm instead of LocaleICU.cpp
           ['exclude', 'text/LocaleICU\\.(cpp|h)$'],
           ['include', 'text/LocaleMac\\.mm$'],
 
           # The Mac uses mac/KillRingMac.mm instead of the dummy
           # 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$'],
 
           # Use native Mac font code from core.
           ['include', '(fonts/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
 
           # TODO(dro): Merge the opentype vertical data files inclusion across all platforms.
           ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
           ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
 
           # Cherry-pick some files that can't be included by broader regexps.
           # Some of these are used instead of Chromium platform files, see
           # the specific exclusions in the "exclude" list below.
           ['include', 'audio/mac/FFTFrameMac\\.cpp$'],
           ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'],
           ['include', 'mac/ColorMac\\.mm$'],
           ['include', 'mac/BlockExceptions\\.mm$'],
           ['include', 'mac/KillRingMac\\.mm$'],
           ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'],
           ['include', 'mac/NSScrollerImpDetails\\.mm$'],
           ['include', 'mac/ScrollAnimatorMac\\.mm$'],
           ['include', 'mac/ScrollElasticityController\\.mm$'],
           ['include', 'mac/ThemeMac\\.h$'],
           ['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$'],
           ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
 
           # The Mac currently uses FontCustomPlatformDataMac.cpp,
           # included by regex above, instead.
           ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
 
           ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'],
@@ skipping 90 matching lines @@
       }],
       ['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
          'include_dirs': [
            '<(DEPTH)/third_party/openmax_dl',
          ],
         'dependencies': [
           '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',
         ],
       }],
       ['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'],
+              }],
+            ],
+          }],
         ],
       }],
     ],
     'target_conditions': [
       ['OS=="android"', {
         'sources/': [
             ['include', 'exported/linux/WebFontRenderStyle\\.cpp$'],
             ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
         ],
       }],
     ],
-  },
-  # 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',
-      }],
-    ],
   }],
 }