Temporarily disable NEON on Android framework builds.

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 6ca602ca2c801bc70d4561354cddd661a26aca5e..30f269e64bd7623207ecc1c5aaa59451e46a22e9 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -103,7 +103,8 @@
         }],
         [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
-            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
+            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"]) \
+            or (skia_android_framework and skia_arch_type == "arm64")', {

[scroggo, 2014/05/06 19:07:12]

For both changes to this file, would it be possible to add a comment noting the
bug?

           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',
@@ -122,7 +123,7 @@
             '-mno-apcs-frame',
           ]
         }],
-        [ 'skia_arch_type == "arm64"', {
+        [ 'skia_arch_type == "arm64" and skia_android_framework == 0', {
           'sources': [
             '../src/opts/SkBitmapProcState_arm_neon.cpp',
             '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp',