commit 482a582884351288fb701532359652970b1ba7c0
author Hendrik Dahlkamp <hendrik@google.com> Fri Feb 01 14:30:24 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 01 14:30:24 2013 -0800
tree 12ec0a39021a9f7f320d0d546c27c3af5bbb46c3
parent b4c1fd246279b207cb4aaa5e8055885f639c4524
parent b55f69c3fdd4a53d439bba9e8bd047846e1f4783

am b55f69c3: Enable neon-optimized functions

# Via Hendrik Dahlkamp
* commit 'b55f69c3fdd4a53d439bba9e8bd047846e1f4783':
  Enable neon-optimized functions

Android.mk

diff --git a/Android.mk b/Android.mk
index d1c565b..7010fe8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,13 +22,13 @@
 
 common_CFLAGS := -Wall -fexceptions
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq ($(TARGET_ARCH_VARIANT),armv7-a-neon)
     common_CFLAGS += -DLIBYUV_NEON
     common_SRC_FILES += \
-        files/source/compare_neon.cc.neon \
-        files/source/rotate_neon.cc.neon \
-        files/source/row_neon.cc.neon \
-        files/source/scale_neon.cc.neon
+        files/source/compare_neon.cc \
+        files/source/rotate_neon.cc \
+        files/source/row_neon.cc \
+        files/source/scale_neon.cc
 endif
 
 common_C_INCLUDES = $(LOCAL_PATH)/files/include