commit 3f4cfa49f15a62ae54447c8ed66da116677fe978
author Revathi Uddaraju <revathiu@codeaurora.org> Mon Jun 04 20:35:10 2018 +0530
committer Revathi Uddaraju <revathiu@codeaurora.org> Thu Jun 07 10:26:24 2018 +0530
tree 3d4a11ac4d481f21240a2dad9c524a786d81933e
parent d5ad96f496ecfeb591d1b101127537587d791b6b

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

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 4534554..4d107e5 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -80,7 +80,7 @@
 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