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

Commit 136d80a9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm-audio: Remove omx decoder components from mm-audio folder"

parents 4a5211fc b5728835

mm-audio/adec-aac/Android.mk

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
include $(call all-subdir-makefiles)

mm-audio/adec-aac/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
all:

	@echo "invoking adec-aac make"

	$(MAKE) -C qdsp6



install:

	$(MAKE) -C qdsp6 install

mm-audio/adec-aac/Makefile.am

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
SUBDIRS = qdsp6

mm-audio/adec-aac/sw/Android.mk

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
ifneq ($(BUILD_TINY_ANDROID),true)

ifneq ($(BUILD_WITHOUT_PV),true)



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



# ---------------------------------------------------------------------------------

#                 Common definitons

# ---------------------------------------------------------------------------------



libOmxAacDec-def := -g -O3

libOmxAacDec-def += -DQC_MODIFIED

libOmxAacDec-def += -D_ANDROID_

libOmxAacDec-def += -D_ENABLE_QC_MSG_LOG_

libOmxAacDec-def += -DVERBOSE

libOmxAacDec-def += -D_DEBUG



ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)

libOmxAacDec-def += -DAUDIOV2

endif



# ---------------------------------------------------------------------------------

#             Make the apps-test (mm-adec-omxaac-test)

# ---------------------------------------------------------------------------------



include $(CLEAR_VARS)



ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)

mm-aac-dec-test-inc   += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa

mm-aac-dec-test-inc   += $(TARGET_OUT_HEADERS)/mm-core/omxcore

mm-aac-dec-test-inc   += $(PV_TOP)/codecs_v2/omx/omx_mastercore/include \

        		 $(PV_TOP)/codecs_v2/omx/omx_common/include \

        		 $(PV_TOP)/extern_libs_v2/khronos/openmax/include \

        		 $(PV_TOP)/codecs_v2/omx/omx_baseclass/include \

        		 $(PV_TOP)/codecs_v2/omx/omx_aac/include \

        		 $(PV_TOP)/codecs_v2/audio/aac/dec/include \



LOCAL_MODULE            := sw-adec-omxaac-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxAacDec-def)

LOCAL_C_INCLUDES        := $(mm-aac-dec-test-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libopencore_common

LOCAL_SHARED_LIBRARIES  += libomx_sharedlibrary

LOCAL_SHARED_LIBRARIES  += libomx_aacdec_sharedlibrary

LOCAL_SHARED_LIBRARIES  += libaudioalsa



LOCAL_SRC_FILES         := test/omx_aac_dec_test.c



include $(BUILD_EXECUTABLE)

endif



endif #BUILD_WITHOUT_PV

endif #BUILD_TINY_ANDROID



# ---------------------------------------------------------------------------------

#                     END

# ---------------------------------------------------------------------------------

mm-audio/adec-aac/sw/test/omx_aac_dec_test.c

deleted100644 → 0
+0 −1302

File deleted.

Preview size limit exceeded, changes collapsed.