diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:14:14 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:14:14 +0100 |
| commit | 998f3a696f0d671832624637c771e3bda3e0c9f5 (patch) | |
| tree | 67c89508c2eaad57389ffac29d673a09bc8bfaba /media/libstagefright/codecs/on2/h264dec/Android.mk | |
| parent | 1c47b26b1ae695c355e4ec0c317716a397588206 (diff) | |
| parent | 8ad656861c764ea4f8bf8539cb568b01edbf647d (diff) | |
| download | frameworks_av-9ff23bdbde0496d59fb52972d9b3204a34d6b070.zip frameworks_av-9ff23bdbde0496d59fb52972d9b3204a34d6b070.tar.gz frameworks_av-9ff23bdbde0496d59fb52972d9b3204a34d6b070.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0replicant-6.0-alpha-0001
Diffstat (limited to 'media/libstagefright/codecs/on2/h264dec/Android.mk')
| -rw-r--r-- | media/libstagefright/codecs/on2/h264dec/Android.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk index e63b6b1..a16cbdf 100644 --- a/media/libstagefright/codecs/on2/h264dec/Android.mk +++ b/media/libstagefright/codecs/on2/h264dec/Android.mk @@ -84,19 +84,15 @@ 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 ($(TARGET_ARCH),arm) - ifeq ($(ARCH_ARM_HAVE_NEON),true) + +ifeq ($(ARCH_ARM_HAVE_NEON),true) LOCAL_ARM_NEON := true -# LOCAL_CFLAGS := -std=c99 -D._NEON -D._OMXDL - LOCAL_CFLAGS := -DH264DEC_NEON -DH264DEC_OMXDL - LOCAL_SRC_FILES += $(MY_ASM) $(MY_OMXDL_C_SRC) $(MY_OMXDL_ASM_SRC) - LOCAL_C_INCLUDES += $(LOCAL_PATH)/./source/arm_neon_asm_gcc - LOCAL_C_INCLUDES += $(LOCAL_PATH)/./omxdl/arm_neon/api \ + LOCAL_CFLAGS_arm := -DH264DEC_NEON -DH264DEC_OMXDL + LOCAL_SRC_FILES_arm := $(MY_ASM) $(MY_OMXDL_C_SRC) $(MY_OMXDL_ASM_SRC) + LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/./source/arm_neon_asm_gcc + LOCAL_C_INCLUDES_arm += $(LOCAL_PATH)/./omxdl/arm_neon/api \ $(LOCAL_PATH)/./omxdl/arm_neon/vc/api \ $(LOCAL_PATH)/./omxdl/arm_neon/vc/m4p10/api - # h264bsdWriteMacroblock.S does not compile with Clang. - LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as - endif endif LOCAL_SHARED_LIBRARIES := \ |