hal: use omx core headers as a header library
Change-Id: I6c1801c0b2a58fdb6cea2b354e16df3d22fdde41
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk
index 615806d..5d8b725 100644
--- a/mm-audio/aenc-aac/qdsp6/Android.mk
+++ b/mm-audio/aenc-aac/qdsp6/Android.mk
@@ -24,7 +24,6 @@
include $(CLEAR_VARS)
libOmxAacEnc-inc := $(LOCAL_PATH)/inc
-libOmxAacEnc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := libOmxAacEnc
LOCAL_MODULE_TAGS := optional
@@ -47,11 +46,10 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
+LOCAL_HEADER_LIBRARIES := libomxcore_headers
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
-endif
-ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+ LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
@@ -68,7 +66,6 @@
mm-aac-enc-test-inc := $(LOCAL_PATH)/inc
mm-aac-enc-test-inc += $(LOCAL_PATH)/test
-mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxaac-test
LOCAL_MODULE_TAGS := optional
diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk
index 094b3a6..17ff2aa 100644
--- a/mm-audio/aenc-amrnb/qdsp6/Android.mk
+++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk
@@ -25,7 +25,6 @@
include $(CLEAR_VARS)
libOmxAmrEnc-inc := $(LOCAL_PATH)/inc
-libOmxAmrEnc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := libOmxAmrEnc
LOCAL_MODULE_TAGS := optional
@@ -49,11 +48,9 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := libomxcore_headers
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
-endif
-ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+ LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
@@ -71,7 +68,6 @@
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
LOCAL_MODULE := mm-aenc-omxamr-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxAmrEnc-def)
diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk
index 826edba..8ee7298 100644
--- a/mm-audio/aenc-evrc/qdsp6/Android.mk
+++ b/mm-audio/aenc-evrc/qdsp6/Android.mk
@@ -25,7 +25,6 @@
include $(CLEAR_VARS)
libOmxEvrcEnc-inc := $(LOCAL_PATH)/inc
-libOmxEvrcEnc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := libOmxEvrcEnc
LOCAL_MODULE_TAGS := optional
@@ -49,11 +48,9 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := libomxcore_headers
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
-endif
-ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+ LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
@@ -70,7 +67,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
+
LOCAL_MODULE := mm-aenc-omxevrc-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxEvrcEnc-def)
diff --git a/mm-audio/aenc-g711/qdsp6/Android.mk b/mm-audio/aenc-g711/qdsp6/Android.mk
index 84c5d61..70e7300 100644
--- a/mm-audio/aenc-g711/qdsp6/Android.mk
+++ b/mm-audio/aenc-g711/qdsp6/Android.mk
@@ -25,7 +25,6 @@
include $(CLEAR_VARS)
libOmxG711Enc-inc := $(LOCAL_PATH)/inc
-libOmxG711Enc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := libOmxG711Enc
LOCAL_MODULE_TAGS := optional
@@ -50,11 +49,9 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := libomxcore_headers
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
-endif
-ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+ LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
@@ -73,7 +70,6 @@
mm-g711-enc-test-inc := $(LOCAL_PATH)/inc
mm-g711-enc-test-inc += $(LOCAL_PATH)/test
-mm-g711-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxg711-test
LOCAL_MODULE_TAGS := optional
diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
index 9e50a79..6b6e950 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk
+++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk
@@ -25,7 +25,6 @@
include $(CLEAR_VARS)
libOmxQcelp13Enc-inc := $(LOCAL_PATH)/inc
-libOmxQcelp13Enc-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := libOmxQcelp13Enc
LOCAL_MODULE_TAGS := optional
@@ -49,11 +48,9 @@
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/audio
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := libomxcore_headers
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
-endif
-ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
- LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+ LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
endif
@@ -73,7 +70,6 @@
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
LOCAL_MODULE := mm-aenc-omxqcelp13-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxQcelp13Enc-def)