aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-07-29 15:31:44 -0700
committerJohn Reck <jreck@google.com>2013-07-29 18:07:46 -0700
commitff996fc884712dee44ec52008a2cfd1385017909 (patch)
tree35b10cf4d683c2aa4e8e9fa3f88333b1f5184d07
parent79f54b86b88ff0bfa1c7a237e0f1c1a361c8e9ca (diff)
downloadpixman-ff996fc884712dee44ec52008a2cfd1385017909.tar.gz
Simplify Android.mk
Drop ARMv6 SIMD support, not worth the extra 40kb Change-Id: I0c383f7734268b1200b9fca5ace50d8e355f0376
-rw-r--r--pixman/Android.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/pixman/Android.mk b/pixman/Android.mk
index b703b13..777aaf3 100644
--- a/pixman/Android.mk
+++ b/pixman/Android.mk
@@ -42,19 +42,12 @@ LOCAL_SRC_FILES := \
pixman-utils.c
ifeq ($(strip $(TARGET_ARCH)),arm)
- ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
- LOCAL_CFLAGS += -DUSE_ARM_NEON
- LOCAL_SRC_FILES += \
- pixman-arm-neon.c \
- pixman-arm-neon-asm.S \
- pixman-arm-neon-asm-bilinear.S
- else
- LOCAL_CFLAGS += -DUSE_ARM_SIMD
- LOCAL_SRC_FILES += \
- pixman-arm-simd.c \
- pixman-arm-simd-asm.S \
- pixman-arm-simd-asm-scaled.S
- endif
+ # Will only be used if runtime detection reports NEON capabilities
+ LOCAL_CFLAGS += -DUSE_ARM_NEON
+ LOCAL_SRC_FILES += \
+ pixman-arm-neon.c \
+ pixman-arm-neon-asm.S \
+ pixman-arm-neon-asm-bilinear.S
endif
LOCAL_STATIC_LIBRARIES := cpufeatures