aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Dahlkamp <hendrik@google.com>2013-02-01 14:30:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-01 14:30:24 -0800
commit482a582884351288fb701532359652970b1ba7c0 (patch)
tree12ec0a39021a9f7f320d0d546c27c3af5bbb46c3
parentb4c1fd246279b207cb4aaa5e8055885f639c4524 (diff)
parentb55f69c3fdd4a53d439bba9e8bd047846e1f4783 (diff)
downloadlibyuv-jb-mr2.0-release.tar.gz
am b55f69c3: Enable neon-optimized functionsandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-m-preview-2android-m-preview-1android-m-previewandroid-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-cts-4.4_r4android-cts-4.4_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2master-soonglollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133
# Via Hendrik Dahlkamp * commit 'b55f69c3fdd4a53d439bba9e8bd047846e1f4783': Enable neon-optimized functions
-rw-r--r--Android.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index d1c565b1..7010fe89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,13 +22,13 @@ common_SRC_FILES := \
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