hal: Remove unnecessary check in make file

- Remove unnecessary target check in make file
- Remove unnecessary mm-audio flag in OMX encoders

Change-Id: I4f8d660e145586e9bc7b4beebde921732e0fecf0

8 files changed, 3 insertions, 109 deletions

diff --git a/mm-audio/aenc-aac/Android.mk b/mm-audio/aenc-aac/Android.mk
index 8ab45b3a..a6c7cce2 100644
--- a/mm-audio/aenc-aac/Android.mk
+++ b/mm-audio/aenc-aac/Android.mk
@@ -3,27 +3,6 @@ ifeq ($(TARGET_ARCH),arm)
 
 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
-
 
 endif
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index e339f5d0..5348353f 100644
--- a/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -13,9 +13,7 @@ libOmxAacEnc-def += -D_ANDROID_
 libOmxAacEnc-def += -D_ENABLE_QC_MSG_LOG_
 libOmxAacEnc-def += -DVERBOSE
 libOmxAacEnc-def += -D_DEBUG
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 libOmxAacEnc-def += -DAUDIOV2
-endif
 
 # ---------------------------------------------------------------------------------
 #             Make the Shared library (libOmxAacEnc)
@@ -49,9 +47,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-audio/audio-alsa
 mm-aac-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-core/omxcore
 
 LOCAL_MODULE            := mm-aenc-omxaac-test
@@ -61,9 +57,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)
diff --git a/mm-audio/aenc-amrnb/Android.mk b/mm-audio/aenc-amrnb/Android.mk
index 2601edeb..b0059b57 100644
--- a/mm-audio/aenc-amrnb/Android.mk
+++ b/mm-audio/aenc-amrnb/Android.mk
@@ -3,27 +3,7 @@ ifeq ($(TARGET_ARCH),arm)
 
 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
 
 
 endif
diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk
index b97e2e5b..4aa986d1 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -13,9 +13,7 @@ libOmxAmrEnc-def += -D_ANDROID_
 libOmxAmrEnc-def += -D_ENABLE_QC_MSG_LOG_
 libOmxAmrEnc-def += -DVERBOSE
 libOmxAmrEnc-def += -D_DEBUG
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 libOmxAmrEnc-def += -DAUDIOV2
-endif
 
 # ---------------------------------------------------------------------------------
 #             Make the Shared library (libOmxAmrEnc)
@@ -51,9 +49,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
+mm-amr-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
 LOCAL_MODULE            := mm-aenc-omxamr-test
 LOCAL_MODULE_TAGS       := optional
 LOCAL_CFLAGS            := $(libOmxAmrEnc-def)
@@ -61,9 +57,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)
diff --git a/mm-audio/aenc-evrc/Android.mk b/mm-audio/aenc-evrc/Android.mk
index 2f42d6ba..606a757c 100644
--- a/mm-audio/aenc-evrc/Android.mk
+++ b/mm-audio/aenc-evrc/Android.mk
@@ -3,27 +3,6 @@ ifeq ($(TARGET_ARCH),arm)
 
 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
-
 
 endif
diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk
index d38d004f..2c104f67 100644
--- a/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -13,9 +13,7 @@ libOmxEvrcEnc-def += -D_ANDROID_
 libOmxEvrcEnc-def += -D_ENABLE_QC_MSG_LOG_
 libOmxEvrcEnc-def += -DVERBOSE
 libOmxEvrcEnc-def += -D_DEBUG
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 libOmxEvrcEnc-def += -DAUDIOV2
-endif
 
 # ---------------------------------------------------------------------------------
 #             Make the Shared library (libOmxEvrcEnc)
@@ -50,9 +48,7 @@ include $(CLEAR_VARS)
 mm-evrc-enc-test-inc    := $(LOCAL_PATH)/inc
 mm-evrc-enc-test-inc    += $(LOCAL_PATH)/test
 mm-evrc-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
-mm-evrc-enc-test-inc     += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa 
-endif
+mm-evrc-enc-test-inc     += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
 LOCAL_MODULE            := mm-aenc-omxevrc-test
 LOCAL_MODULE_TAGS       := optional
 LOCAL_CFLAGS            := $(libOmxEvrcEnc-def)
@@ -60,9 +56,7 @@ LOCAL_C_INCLUDES        := $(mm-evrc-enc-test-inc)
 LOCAL_PRELINK_MODULE    := false
 LOCAL_SHARED_LIBRARIES  := libmm-omxcore
 LOCAL_SHARED_LIBRARIES  += libOmxEvrcEnc
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 LOCAL_SHARED_LIBRARIES  += libaudioalsa
-endif
 LOCAL_SRC_FILES         := test/omx_evrc_enc_test.c
 
 include $(BUILD_EXECUTABLE)
diff --git a/mm-audio/aenc-qcelp13/Android.mk b/mm-audio/aenc-qcelp13/Android.mk
index fe18efc5..0dbabf73 100644
--- a/mm-audio/aenc-qcelp13/Android.mk
+++ b/mm-audio/aenc-qcelp13/Android.mk
@@ -3,26 +3,6 @@ ifeq ($(TARGET_ARCH),arm)
 
 AENC_QCELP13_PATH:= $(call my-dir)
 
-ifeq ($(call is-board-platform,msm8660),true)
 include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,msm8960),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,msm8974),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,msm8226),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,msm8610),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,apq8084),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,mpq8092),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
 
 endif
diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
index 5aaa3bf7..beb38cf8 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -13,9 +13,7 @@ libOmxQcelp13Enc-def += -D_ANDROID_
 libOmxQcelp13Enc-def += -D_ENABLE_QC_MSG_LOG_
 libOmxQcelp13Enc-def += -DVERBOSE
 libOmxQcelp13Enc-def += -D_DEBUG
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 libOmxQcelp13Enc-def += -DAUDIOV2
-endif
 
 # ---------------------------------------------------------------------------------
 #             Make the Shared library (libOmxQcelp13Enc)
@@ -53,9 +51,7 @@ mm-qcelp13-enc-test-inc    := $(LOCAL_PATH)/inc
 mm-qcelp13-enc-test-inc    += $(LOCAL_PATH)/test
 
 mm-qcelp13-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-core/omxcore
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 mm-qcelp13-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
-endif
 LOCAL_MODULE            := mm-aenc-omxqcelp13-test
 LOCAL_MODULE_TAGS       := optional
 LOCAL_CFLAGS            := $(libOmxQcelp13Enc-def)
@@ -63,9 +59,7 @@ LOCAL_C_INCLUDES        := $(mm-qcelp13-enc-test-inc)
 LOCAL_PRELINK_MODULE    := false
 LOCAL_SHARED_LIBRARIES  := libmm-omxcore
 LOCAL_SHARED_LIBRARIES  += libOmxQcelp13Enc
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
 LOCAL_SHARED_LIBRARIES  += libaudioalsa
-endif
 LOCAL_SRC_FILES         := test/omx_qcelp13_enc_test.c
 
 include $(BUILD_EXECUTABLE)