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/amrwbenc/Android.mk | |
| parent | 1c47b26b1ae695c355e4ec0c317716a397588206 (diff) | |
| parent | 8ad656861c764ea4f8bf8539cb568b01edbf647d (diff) | |
| download | frameworks_av-replicant-6.0-alpha-0001.zip frameworks_av-replicant-6.0-alpha-0001.tar.gz frameworks_av-replicant-6.0-alpha-0001.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/amrwbenc/Android.mk')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/Android.mk | 85 |
1 files changed, 37 insertions, 48 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 024a292..8ded6df 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -1,8 +1,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include frameworks/av/media/libstagefright/codecs/common/Config.mk - - LOCAL_SRC_FILES := \ src/autocorr.c \ @@ -53,42 +50,41 @@ LOCAL_SRC_FILES := \ src/weight_a.c \ src/mem_align.c - -ifeq ($(VOTT), v5) -LOCAL_SRC_FILES += \ - src/asm/ARMV5E/convolve_opt.s \ - src/asm/ARMV5E/cor_h_vec_opt.s \ - src/asm/ARMV5E/Deemph_32_opt.s \ - src/asm/ARMV5E/Dot_p_opt.s \ - src/asm/ARMV5E/Filt_6k_7k_opt.s \ - src/asm/ARMV5E/Norm_Corr_opt.s \ - src/asm/ARMV5E/pred_lt4_1_opt.s \ - src/asm/ARMV5E/residu_asm_opt.s \ - src/asm/ARMV5E/scale_sig_opt.s \ - src/asm/ARMV5E/Syn_filt_32_opt.s \ - src/asm/ARMV5E/syn_filt_opt.s - -endif - -ifeq ($(VOTT), v7) -LOCAL_SRC_FILES += \ - src/asm/ARMV7/convolve_neon.s \ - src/asm/ARMV7/cor_h_vec_neon.s \ - src/asm/ARMV7/Deemph_32_neon.s \ - src/asm/ARMV7/Dot_p_neon.s \ - src/asm/ARMV7/Filt_6k_7k_neon.s \ - src/asm/ARMV7/Norm_Corr_neon.s \ - src/asm/ARMV7/pred_lt4_1_neon.s \ - src/asm/ARMV7/residu_asm_neon.s \ - src/asm/ARMV7/scale_sig_neon.s \ - src/asm/ARMV7/Syn_filt_32_neon.s \ - src/asm/ARMV7/syn_filt_neon.s - +ifneq ($(ARCH_ARM_HAVE_NEON),true) + LOCAL_SRC_FILES_arm := \ + src/asm/ARMV5E/convolve_opt.s \ + src/asm/ARMV5E/cor_h_vec_opt.s \ + src/asm/ARMV5E/Deemph_32_opt.s \ + src/asm/ARMV5E/Dot_p_opt.s \ + src/asm/ARMV5E/Filt_6k_7k_opt.s \ + src/asm/ARMV5E/Norm_Corr_opt.s \ + src/asm/ARMV5E/pred_lt4_1_opt.s \ + src/asm/ARMV5E/residu_asm_opt.s \ + src/asm/ARMV5E/scale_sig_opt.s \ + src/asm/ARMV5E/Syn_filt_32_opt.s \ + src/asm/ARMV5E/syn_filt_opt.s + + LOCAL_CFLAGS_arm := -DARM -DASM_OPT + LOCAL_C_INCLUDES_arm = $(LOCAL_PATH)/src/asm/ARMV5E +else + LOCAL_SRC_FILES_arm := \ + src/asm/ARMV7/convolve_neon.s \ + src/asm/ARMV7/cor_h_vec_neon.s \ + src/asm/ARMV7/Deemph_32_neon.s \ + src/asm/ARMV7/Dot_p_neon.s \ + src/asm/ARMV7/Filt_6k_7k_neon.s \ + src/asm/ARMV7/Norm_Corr_neon.s \ + src/asm/ARMV7/pred_lt4_1_neon.s \ + src/asm/ARMV7/residu_asm_neon.s \ + src/asm/ARMV7/scale_sig_neon.s \ + src/asm/ARMV7/Syn_filt_32_neon.s \ + src/asm/ARMV7/syn_filt_neon.s + + LOCAL_CFLAGS_arm := -DARM -DARMV7 -DASM_OPT + LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/src/asm/ARMV5E + LOCAL_C_INCLUDES_arm += $(LOCAL_PATH)/src/asm/ARMV7 endif -# ARMV5E/Filt_6k_7k_opt.s does not compile with Clang. -LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as - LOCAL_MODULE := libstagefright_amrwbenc LOCAL_ARM_MODE := arm @@ -104,18 +100,9 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/inc -ifeq ($(VOTT), v5) -LOCAL_CFLAGS += -DARM -DASM_OPT -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E -endif - -ifeq ($(VOTT), v7) -LOCAL_CFLAGS += -DARM -DARMV7 -DASM_OPT -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV7 -endif - LOCAL_CFLAGS += -Werror +LOCAL_CLANG := true +#LOCAL_SANITIZE := signed-integer-overflow include $(BUILD_STATIC_LIBRARY) @@ -132,6 +119,8 @@ LOCAL_C_INCLUDES := \ frameworks/native/include/media/openmax LOCAL_CFLAGS += -Werror +LOCAL_CLANG := true +#LOCAL_SANITIZE := signed-integer-overflow LOCAL_STATIC_LIBRARIES := \ libstagefright_amrwbenc |