hal: audio_extn: fix LOCAL_ADDITIONAL_DEPENDENCIES in makefile
LOCAL_ADDITIONAL_DEPENDENCIES must only contain paths and
should not be dependent on module names.
CRs-Fixed: 2423819
Change-Id: I15019a68a92666b26a2027dc86a8b795e44663e4
diff --git a/hal/audio_extn/Android.mk b/hal/audio_extn/Android.mk
index 3f341b1..4af00cc 100644
--- a/hal/audio_extn/Android.mk
+++ b/hal/audio_extn/Android.mk
@@ -21,23 +21,23 @@
-Wno-unused-variable \
LOCAL_SHARED_LIBRARIES := \
- libaudioutils \
- libcutils \
- liblog \
- libtinyalsa \
- libtinycompress \
- libaudioroute \
- libdl \
- libexpat
+ libaudioutils \
+ libcutils \
+ liblog \
+ libtinyalsa \
+ libtinycompress \
+ libaudioroute \
+ libdl \
+ libexpat
LOCAL_C_INCLUDES := \
- external/tinyalsa/include \
- external/tinycompress/include \
- system/media/audio_utils/include \
- external/expat/lib \
- $(call include-path-for, audio-route) \
- vendor/qcom/opensource/audio-hal/primary-hal/hal \
- $(call include-path-for, audio-effects)
+ external/tinyalsa/include \
+ external/tinycompress/include \
+ system/media/audio_utils/include \
+ external/expat/lib \
+ $(call include-path-for, audio-route) \
+ vendor/qcom/opensource/audio-hal/primary-hal/hal \
+ $(call include-path-for, audio-effects)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
@@ -46,7 +46,6 @@
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
- LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -80,24 +79,24 @@
-Wno-unused-variable \
LOCAL_SHARED_LIBRARIES := \
- libaudioutils \
- libcutils \
- liblog \
- libtinyalsa \
- libtinycompress \
- libaudioroute \
- libdl \
- libexpat
+ libaudioutils \
+ libcutils \
+ liblog \
+ libtinyalsa \
+ libtinycompress \
+ libaudioroute \
+ libdl \
+ libexpat
LOCAL_C_INCLUDES := \
- external/tinyalsa/include \
- external/tinycompress/include \
- system/media/audio_utils/include \
- external/expat/lib \
- $(call include-path-for, audio-route) \
- vendor/qcom/opensource/audio-hal/primary-hal/hal \
+ external/tinyalsa/include \
+ external/tinycompress/include \
+ system/media/audio_utils/include \
+ external/expat/lib \
+ $(call include-path-for, audio-route) \
+ vendor/qcom/opensource/audio-hal/primary-hal/hal \
vendor/qcom/opensource/audio-hal/primary-hal/hal/$(AUDIO_PLATFORM) \
- $(call include-path-for, audio-effects)
+ $(call include-path-for, audio-effects)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
@@ -106,7 +105,6 @@
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
- LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -166,7 +164,6 @@
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
- LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -200,24 +197,24 @@
-Wno-unused-variable \
LOCAL_SHARED_LIBRARIES := \
- libaudioutils \
- libcutils \
- liblog \
- libtinyalsa \
- libtinycompress \
- libaudioroute \
- libdl \
- libexpat
+ libaudioutils \
+ libcutils \
+ liblog \
+ libtinyalsa \
+ libtinycompress \
+ libaudioroute \
+ libdl \
+ libexpat
LOCAL_C_INCLUDES := \
- external/tinyalsa/include \
- external/tinycompress/include \
- system/media/audio_utils/include \
- external/expat/lib \
- $(call include-path-for, audio-route) \
- $(PRIMARY_HAL_PATH) \
- $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \
- $(call include-path-for, audio-effects)
+ external/tinyalsa/include \
+ external/tinycompress/include \
+ system/media/audio_utils/include \
+ external/expat/lib \
+ $(call include-path-for, audio-route) \
+ $(PRIMARY_HAL_PATH) \
+ $(PRIMARY_HAL_PATH)/$(AUDIO_PLATFORM) \
+ $(call include-path-for, audio-effects)
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
@@ -226,7 +223,6 @@
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
- LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
LOCAL_HEADER_LIBRARIES += libhardware_headers
@@ -391,7 +387,6 @@
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM)),true)
LOCAL_HEADER_LIBRARIES += audio_kernel_headers
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
- LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
endif
LOCAL_HEADER_LIBRARIES += libhardware_headers