diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 20:15:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 20:15:52 +0000 |
| commit | f1f5475ffb1898f415a54e362fee620907b93d34 (patch) | |
| tree | b7c204e8a7841d86496698ba967b74acb5c4433a /media | |
| parent | 08d6608556b44f90f6e7fb7dc280f4509af79502 (diff) | |
| parent | 9219bfc48ccfab892913e37eaa85921f7e9b2d51 (diff) | |
| download | frameworks_av-f1f5475ffb1898f415a54e362fee620907b93d34.zip frameworks_av-f1f5475ffb1898f415a54e362fee620907b93d34.tar.gz frameworks_av-f1f5475ffb1898f415a54e362fee620907b93d34.tar.bz2 | |
am 9219bfc4: am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
* commit '9219bfc48ccfab892913e37eaa85921f7e9b2d51':
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 := \ |