From 32624777b845f24901aa4ae768a01bf3ef412e28 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Thu, 5 Nov 2015 15:25:52 +0800 Subject: Android.mk: make 32bit binary use arm assembly code on 64bit platform update to use "ifeq ($(ARCH_ARM_HAVE_NEON),true)" instead of "ifeq ($(TARGET_ARCH_VARIANT),armv7-a-neon)" as condition check, so that the 32bit binary or libray on arm64bit platform can use the NEON implementation as well. Change-Id: Ib632e823ed904dce82808fdb391b428bef07deb2 Signed-off-by: Yongqin Liu --- Android.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Android.mk b/Android.mk index 5be19252..474e22da 100644 --- a/Android.mk +++ b/Android.mk @@ -21,15 +21,6 @@ common_SRC_FILES := \ 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_SRC_FILES := $(common_SRC_FILES) 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 -- cgit v1.2.3