Merge "hal: Remove unnecessary check in make file"
diff --git a/mm-audio/aenc-aac/Android.mk b/mm-audio/aenc-aac/Android.mk
index cb582ff..986e7c9 100644
--- a/mm-audio/aenc-aac/Android.mk
+++ b/mm-audio/aenc-aac/Android.mk
@@ -3,32 +3,6 @@
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
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index ac9e0cc..d55733a 100644
--- a/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -14,9 +14,7 @@
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 @@
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
@@ -62,9 +58,7 @@
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 285ad9d..4834ad5 100644
--- a/mm-audio/aenc-amrnb/Android.mk
+++ b/mm-audio/aenc-amrnb/Android.mk
@@ -3,32 +3,6 @@
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
diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk
index 21efdfd..fa8cb23 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -14,9 +14,7 @@
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)/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)
@@ -62,9 +58,7 @@
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 09c9ebd..d8d0818 100644
--- a/mm-audio/aenc-evrc/Android.mk
+++ b/mm-audio/aenc-evrc/Android.mk
@@ -2,32 +2,6 @@
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
diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk
index 98d95b1..42a6b13 100644
--- a/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -14,9 +14,7 @@
libOmxEvrcEnc-def += -DVERBOSE
libOmxEvrcEnc-def += -D_DEBUG
libOmxEvrcEnc-def += -Wconversion
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
libOmxEvrcEnc-def += -DAUDIOV2
-endif
# ---------------------------------------------------------------------------------
# Make the Shared library (libOmxEvrcEnc)
@@ -51,9 +49,7 @@
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)
@@ -61,9 +57,7 @@
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 2400c47..58d0456 100644
--- a/mm-audio/aenc-qcelp13/Android.mk
+++ b/mm-audio/aenc-qcelp13/Android.mk
@@ -2,32 +2,6 @@
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
-ifeq ($(call is-board-platform,msm8916),true)
-include $(AENC_QCELP13_PATH)/qdsp6/Android.mk
-endif
-ifeq ($(call is-board-platform,msm8994),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 1c9ffe1..6841d1a 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -14,9 +14,7 @@
libOmxQcelp13Enc-def += -DVERBOSE
libOmxQcelp13Enc-def += -D_DEBUG
libOmxQcelp13Enc-def += -Wconversion
-ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)
libOmxQcelp13Enc-def += -DAUDIOV2
-endif
# ---------------------------------------------------------------------------------
# Make the Shared library (libOmxQcelp13Enc)
@@ -54,9 +52,7 @@
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)
@@ -64,9 +60,7 @@
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)