aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkUtilsArm.h
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-22 13:42:34 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-22 13:42:34 +0000
commitab08437e39b3d1f52d45d04730c03391f22c20f7 (patch)
treece3d47af10e68618c48fa99526ad2e3c1d1483fd /src/core/SkUtilsArm.h
parent4885d500f160cdd617619cc76b7040f75e2d4c3b (diff)
Revert "Temporarily disable NEON on Android framework builds."
R=scroggo@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/294183002 git-svn-id: http://skia.googlecode.com/svn/trunk@14844 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkUtilsArm.h')
-rw-r--r--src/core/SkUtilsArm.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/SkUtilsArm.h b/src/core/SkUtilsArm.h
index ebbbb20b43..93f626c6e7 100644
--- a/src/core/SkUtilsArm.h
+++ b/src/core/SkUtilsArm.h
@@ -23,9 +23,6 @@
#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