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

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

Merge "hal: Remove unnecessary check in make file"

parents 1159ee3c a5374a3a

mm-audio/aenc-aac/Android.mk

+0 −26
Original line number Diff line number Diff line
@@ -3,32 +3,6 @@ ifneq ($(filter arm aarch64 arm64, $(TARGET_ARCH)),) 


AENC_AAC_PATH:= $(call my-dir)



ifeq ($(call is-board-platform,msm8660),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8960),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8974),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8226),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8610),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,apq8084),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,mpq8092),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8916),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8994),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif



endif

mm-audio/aenc-aac/qdsp6/Android.mk

+1 −7
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ libOmxAacEnc-def += -D_ENABLE_QC_MSG_LOG_ 
libOmxAacEnc-def += -DVERBOSE

libOmxAacEnc-def += -D_DEBUG

libOmxAacEnc-def += -Wconversion

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

libOmxAacEnc-def += -DAUDIOV2

endif



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

#             Make the Shared library (libOmxAacEnc)
@@ -50,9 +48,7 @@ include $(CLEAR_VARS) 


mm-aac-enc-test-inc    := $(LOCAL_PATH)/inc

mm-aac-enc-test-inc    += $(LOCAL_PATH)/test

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

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

endif

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



LOCAL_MODULE            := mm-aenc-omxaac-test
@@ -62,9 +58,7 @@ LOCAL_C_INCLUDES := $(mm-aac-enc-test-inc) 
LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore

LOCAL_SHARED_LIBRARIES  += libOmxAacEnc

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

LOCAL_SHARED_LIBRARIES  += libaudioalsa

endif

LOCAL_SRC_FILES         := test/omx_aac_enc_test.c



include $(BUILD_EXECUTABLE)

mm-audio/aenc-amrnb/Android.mk

+0 −26
Original line number Diff line number Diff line
@@ -3,32 +3,6 @@ ifneq ($(filter arm aarch64 arm64, $(TARGET_ARCH)),) 


AENC_AMR_PATH:= $(call my-dir)



ifeq ($(call is-board-platform,msm8660),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8960),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8974),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8226),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8610),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,apq8084),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,mpq8092),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8916),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8994),true)

include $(AENC_AMR_PATH)/qdsp6/Android.mk

endif



endif

mm-audio/aenc-amrnb/qdsp6/Android.mk

+1 −7
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ libOmxAmrEnc-def += -D_ENABLE_QC_MSG_LOG_ 
libOmxAmrEnc-def += -DVERBOSE

libOmxAmrEnc-def += -D_DEBUG

libOmxAmrEnc-def += -Wconversion

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

libOmxAmrEnc-def += -DAUDIOV2

endif



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

#             Make the Shared library (libOmxAmrEnc)
@@ -52,9 +50,7 @@ mm-amr-enc-test-inc := $(LOCAL_PATH)/inc 
mm-amr-enc-test-inc    += $(LOCAL_PATH)/test



mm-amr-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-core/omxcore

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

mm-amr-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa

endif

LOCAL_MODULE            := mm-aenc-omxamr-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxAmrEnc-def)
@@ -62,9 +58,7 @@ LOCAL_C_INCLUDES := $(mm-amr-enc-test-inc) 
LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore

LOCAL_SHARED_LIBRARIES  += libOmxAmrEnc

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

LOCAL_SHARED_LIBRARIES  += libaudioalsa

endif

LOCAL_SRC_FILES         := test/omx_amr_enc_test.c



include $(BUILD_EXECUTABLE)

mm-audio/aenc-evrc/Android.mk

+0 −26
Original line number Diff line number Diff line
@@ -2,32 +2,6 @@ ifneq ($(filter arm aarch64 arm64, $(TARGET_ARCH)),) 


AENC_EVRC_PATH:= $(call my-dir)



ifeq ($(call is-board-platform,msm8660),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8960),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8974),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8226),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8610),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,apq8084),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,mpq8092),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8916),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8994),true)

include $(AENC_EVRC_PATH)/qdsp6/Android.mk

endif



endif