Index: src/core/SkUtilsArm.h |
diff --git a/src/core/SkUtilsArm.h b/src/core/SkUtilsArm.h |
index 93f626c6e757d3a9075aa688cbe12057faec2a66..ebbbb20b439e4a9db31094cc31dd2da7ae29a3d7 100644 |
--- a/src/core/SkUtilsArm.h |
+++ b/src/core/SkUtilsArm.h |
@@ -23,6 +23,9 @@ |
#if defined(SK_CPU_ARM) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) |
# define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC |
+/* b/14056351 - temporarily disable NEON support for arm64 */ |
+#elif defined(SK_CPU_ARM64) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) |
+# define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE |
#elif defined(SK_CPU_ARM) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64) |
# define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS |
#else |