diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2014-02-28 20:12:05 +0000 |
|---|---|---|
| committer | Ashok Bhat <ashok.bhat@arm.com> | 2014-03-03 20:06:47 +0000 |
| commit | db46c2f8ff4b305a217adbbd406a61d10ae71db7 (patch) | |
| tree | 5c0c0dd3efc16dfc05a1c1763bd7104f0609ceae /media/libstagefright/codecs | |
| parent | 0cf1633922f970caee19e2cc2f5c042ca30b4aa6 (diff) | |
| download | frameworks_av-db46c2f8ff4b305a217adbbd406a61d10ae71db7.zip frameworks_av-db46c2f8ff4b305a217adbbd406a61d10ae71db7.tar.gz frameworks_av-db46c2f8ff4b305a217adbbd406a61d10ae71db7.tar.bz2 | |
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
This patch prevents ARM neon code from being included
for Arm64, where ARM is the 2nd architecture.
Change-Id: I5a283991034f2650a0e7d4227aef967be276fc9c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Diffstat (limited to 'media/libstagefright/codecs')
| -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 := \ |