diff options
author | Narayan Kamath <narayan@google.com> | 2014-03-07 16:04:47 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-07 16:04:48 +0000 |
commit | 2ad7af29bb667d939f27417011567847c4b62f94 (patch) | |
tree | eb0c1b627d3d8c4d0373048c975e3f7e1adc53e8 /media | |
parent | a9b82160a6682438d43709ba5e7a29022ad1af58 (diff) | |
parent | db46c2f8ff4b305a217adbbd406a61d10ae71db7 (diff) | |
download | frameworks_av-2ad7af29bb667d939f27417011567847c4b62f94.zip frameworks_av-2ad7af29bb667d939f27417011567847c4b62f94.tar.gz frameworks_av-2ad7af29bb667d939f27417011567847c4b62f94.tar.bz2 |
Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/codecs/common/Config.mk | 6 | ||||
-rw-r--r-- | media/libstagefright/codecs/on2/h264dec/Android.mk | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/common/Config.mk b/media/libstagefright/codecs/common/Config.mk index a6d4286..a843cef 100644 --- a/media/libstagefright/codecs/common/Config.mk +++ b/media/libstagefright/codecs/common/Config.mk @@ -14,8 +14,10 @@ VOTT := pc endif # Do we also need to check on ARCH_ARM_HAVE_ARMV7A? - probably not -ifeq ($(ARCH_ARM_HAVE_NEON),true) -VOTT := v7 +ifeq ($(TARGET_ARCH),arm) + ifeq ($(ARCH_ARM_HAVE_NEON),true) + VOTT := v7 + endif endif VOTEST := 0 diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk index 655b2ab..bf03ad9 100644 --- a/media/libstagefright/codecs/on2/h264dec/Android.mk +++ b/media/libstagefright/codecs/on2/h264dec/Android.mk @@ -84,8 +84,8 @@ MY_OMXDL_ASM_SRC := \ ./omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S \ ./omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S \ - -ifeq ($(ARCH_ARM_HAVE_NEON),true) +ifeq ($(TARGET_ARCH),arm) + ifeq ($(ARCH_ARM_HAVE_NEON),true) LOCAL_ARM_NEON := true # LOCAL_CFLAGS := -std=c99 -D._NEON -D._OMXDL LOCAL_CFLAGS := -DH264DEC_NEON -DH264DEC_OMXDL @@ -94,6 +94,7 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true) LOCAL_C_INCLUDES += $(LOCAL_PATH)/./omxdl/arm_neon/api \ $(LOCAL_PATH)/./omxdl/arm_neon/vc/api \ $(LOCAL_PATH)/./omxdl/arm_neon/vc/m4p10/api + endif endif LOCAL_SHARED_LIBRARIES := \ |