diff options
| author | Ying Wang <wangying@google.com> | 2016-01-08 14:58:00 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2016-01-08 14:58:00 -0800 |
| commit | 554f0a899015a9aa5ae2a60e465a10bb2b3704f0 (patch) | |
| tree | ce4e8c230cd873131ab5f9ea81c0d55a722e240c | |
| parent | 6118f52739ac45de997706bc602b6d766b2bd0dc (diff) | |
| parent | 32624777b845f24901aa4ae768a01bf3ef412e28 (diff) | |
| download | libyuv-554f0a899015a9aa5ae2a60e465a10bb2b3704f0.tar.gz | |
resolve merge conflicts of 32624777b845 to master.
Change-Id: Ib6a23b391f495fbb88328f364bc45ca1adf49bc5
| -rw-r--r-- | Android.mk | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -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 @@ -48,7 +39,16 @@ LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/files/include + +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 include $(BUILD_STATIC_LIBRARY) |