commit a144ab1ba53050cbd4cda24ffa6eab23e9282aa3
author Ying Wang <wangying@android.com> Fri Jan 08 20:19:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 20:19:28 2016 +0000
tree a2d854bda54bc25efeeced2f100b7209dc669699
parent 613f94db72ea295b8e7040f508ea0bbb782714a2
parent 32624777b845f24901aa4ae768a01bf3ef412e28

Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform"

Android.mk

diff --git a/Android.mk b/Android.mk
index 5be1925..474e22d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,15 +21,6 @@
 
 common_CFLAGS := -Wall -fexceptions
 
-ifeq ($(TARGET_ARCH_VARIANT),armv7-a-neon)
-    common_CFLAGS += -DLIBYUV_NEON
-    common_SRC_FILES += \
-        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
 
 # For the device
@@ -47,6 +38,15 @@
 LOCAL_CFLAGS += $(common_CFLAGS)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+    LOCAL_CFLAGS_arm += -DLIBYUV_NEON
+    LOCAL_SRC_FILES_arm += \
+        files/source/compare_neon.cc \
+        files/source/rotate_neon.cc \
+        files/source/row_neon.cc \
+        files/source/scale_neon.cc
+endif
+
 LOCAL_MODULE:= libyuv_static
 LOCAL_MODULE_TAGS := optional