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

Commit 3f4cfa49 authored Jun 04, 2018 by Revathi Uddaraju

hal: Append the local header libraries

As part of the VNDK changes, libhardware_headers is being
added as local header libraries before audio_kernel_headers.
So, append the local header libraries for audio_kernel_headers
to avoid overwrite.

Change-Id: Ie184930eaaa9fd425f73fc13a2fdc849f3c01e94

parent d5ad96f4

hal/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/in
		LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr

		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
		LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
		endif

post_proc/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ LOCAL_C_INCLUDES := \
		$(call include-path-for, audio-effects)

		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
		LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
		endif
		@@ -180,7 +180,7 @@ LOCAL_C_INCLUDES := \
		external/tinycompress/include

		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
		LOCAL_ADDITIONAL_DEPENDENCIES += $(BOARD_VENDOR_KERNEL_MODULES)
		endif