Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c315acb9 authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "codecs: update for check ifeq (,arm)" am: 7abffd68 

am: 899cce32

* commit '899cce32':
  codecs: update for check ifeq ($(TARGET_ARCH),arm)
parents a14f8200 899cce32

media/libstagefright/Android.mk

+0 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



include frameworks/av/media/libstagefright/codecs/common/Config.mk



LOCAL_SRC_FILES:=                         \

        ACodec.cpp                        \

media/libstagefright/codecs/aacenc/Android.mk

+22 −30
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

include frameworks/av/media/libstagefright/codecs/common/Config.mk



AAC_LIBRARY = fraunhofer
@@ -35,24 +34,28 @@ LOCAL_SRC_FILES += \ 
	src/transform.c \

	src/memalign.c



ifeq ($(VOTT), v5)

LOCAL_SRC_FILES += \

ifneq ($(ARCH_ARM_HAVE_NEON),true)

    LOCAL_SRC_FILES_arm := \

        src/asm/ARMV5E/AutoCorrelation_v5.s \

        src/asm/ARMV5E/band_nrg_v5.s \

        src/asm/ARMV5E/CalcWindowEnergy_v5.s \

        src/asm/ARMV5E/PrePostMDCT_v5.s \

        src/asm/ARMV5E/R4R8First_v5.s \

        src/asm/ARMV5E/Radix4FFT_v5.s

endif



ifeq ($(VOTT), v7)

LOCAL_SRC_FILES += \

    LOCAL_CFLAGS_arm := -DARMV5E -DARM_INASM -DARMV5_INASM

    LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/src/asm/ARMV5E

else

    LOCAL_SRC_FILES_arm := \

        src/asm/ARMV5E/AutoCorrelation_v5.s \

        src/asm/ARMV5E/band_nrg_v5.s \

        src/asm/ARMV5E/CalcWindowEnergy_v5.s \

        src/asm/ARMV7/PrePostMDCT_v7.s \

        src/asm/ARMV7/R4R8First_v7.s \

        src/asm/ARMV7/Radix4FFT_v7.s

    LOCAL_CFLAGS_arm := -DARMV5E -DARMV7Neon -DARM_INASM -DARMV5_INASM -DARMV6_INASM

    LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/src/asm/ARMV5E

    LOCAL_C_INCLUDES_arm += $(LOCAL_PATH)/src/asm/ARMV7

endif



LOCAL_MODULE := libstagefright_aacenc
@@ -71,17 +74,6 @@ LOCAL_C_INCLUDES := \ 
	$(LOCAL_PATH)/inc \

	$(LOCAL_PATH)/basic_op



ifeq ($(VOTT), v5)

LOCAL_CFLAGS += -DARMV5E -DARM_INASM -DARMV5_INASM

LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E

endif



ifeq ($(VOTT), v7)

LOCAL_CFLAGS += -DARMV5E -DARMV7Neon -DARM_INASM -DARMV5_INASM -DARMV6_INASM

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 unsigned-integer-overflow

media/libstagefright/codecs/amrwbenc/Android.mk

+33 −45
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

include frameworks/av/media/libstagefright/codecs/common/Config.mk







LOCAL_SRC_FILES := \

	src/autocorr.c \
@@ -53,9 +50,8 @@ LOCAL_SRC_FILES := \ 
	src/weight_a.c \

	src/mem_align.c





ifeq ($(VOTT), v5)

LOCAL_SRC_FILES += \

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 \
@@ -68,10 +64,10 @@ LOCAL_SRC_FILES += \ 
        src/asm/ARMV5E/Syn_filt_32_opt.s \

        src/asm/ARMV5E/syn_filt_opt.s



endif



ifeq ($(VOTT), v7)

LOCAL_SRC_FILES += \

    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 \
@@ -84,6 +80,9 @@ LOCAL_SRC_FILES += \ 
        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



LOCAL_MODULE := libstagefright_amrwbenc
@@ -101,17 +100,6 @@ 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

media/libstagefright/codecs/common/Config.mk

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#

# This configure file is just for Linux projects against Android

#



VOPRJ :=

VONJ :=



# WARNING:

# Using v7 breaks generic build

ifeq ($(TARGET_ARCH),arm)

VOTT := v5

else

VOTT := pc

endif



# Do we also need to check on ARCH_ARM_HAVE_ARMV7A? - probably not

ifeq ($(TARGET_ARCH),arm)

  ifeq ($(ARCH_ARM_HAVE_NEON),true)

    VOTT := v7

  endif

endif



VOTEST := 0

media/libstagefright/codecs/mp3dec/Android.mk

+8 −5
Original line number Diff line number Diff line
@@ -28,19 +28,22 @@ LOCAL_SRC_FILES := \ 
 	src/pvmp3_stereo_proc.cpp \

 	src/pvmp3_reorder.cpp \



ifeq ($(TARGET_ARCH),arm)

LOCAL_SRC_FILES += \

LOCAL_SRC_FILES_arm += \

	src/asm/pvmp3_polyphase_filter_window_gcc.s \

 	src/asm/pvmp3_mdct_18_gcc.s \

 	src/asm/pvmp3_dct_9_gcc.s \

	src/asm/pvmp3_dct_16_gcc.s

else

LOCAL_SRC_FILES += \

LOCAL_SRC_FILES_other_archs := \

 	src/pvmp3_polyphase_filter_window.cpp \

 	src/pvmp3_mdct_18.cpp \

 	src/pvmp3_dct_9.cpp \

 	src/pvmp3_dct_16.cpp

endif



LOCAL_SRC_FILES_arm64  := $(LOCAL_SRC_FILES_other_archs)

LOCAL_SRC_FILES_mips   := $(LOCAL_SRC_FILES_other_archs)

LOCAL_SRC_FILES_mips64 := $(LOCAL_SRC_FILES_other_archs)

LOCAL_SRC_FILES_x86    := $(LOCAL_SRC_FILES_other_archs)

LOCAL_SRC_FILES_x86_64 := $(LOCAL_SRC_FILES_other_archs)



LOCAL_C_INCLUDES := \

        frameworks/av/media/libstagefright/include \