commit e8bd13c7199bf37d4b9c1dfedf97010e6bdc3d4e
author Revathi Uddaraju <revathiu@codeaurora.org> Mon Apr 02 21:27:54 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 04 09:32:08 2018 -0700
tree e08f4b19496d14412ce43ffd74f5d13cf6c86f4b
parent a7e30cc3ed0fba27feb24dca5314bf39428e5f0f

audio: Access header files through header libs

Access header files through header libs which are not accessed
directly.

Change-Id: Ia98e31fd43d56e9bb4786ee00de49961047808d4

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 51f758e..ae8dd5a 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -61,6 +61,8 @@
 
 LOCAL_CFLAGS += -Wno-macro-redefined
 
+LOCAL_HEADER_LIBRARIES := libhardware_headers
+
 LOCAL_SRC_FILES := \
 	audio_hw.c \
 	voice.c \
@@ -74,7 +76,7 @@
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/techpack/audio/include
 LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)
-  LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+  LOCAL_HEADER_LIBRARIES += audio_kernel_headers
 endif
 ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)
   LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

post_proc/Android.mk

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index b047245..778c330 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -45,6 +45,10 @@
     LOCAL_CFLAGS += -DDTS_EAGLE
 endif
 
+LOCAL_HEADER_LIBRARIES := libhardware_headers \
+                          libsystem_headers \
+                          libutils_headers
+
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
         liblog \
@@ -66,7 +70,7 @@
         $(call include-path-for, audio-effects)
 
 ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)
-  LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+  LOCAL_HEADER_LIBRARIES += audio_kernel_headers
 endif
 ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)
   LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include
@@ -100,6 +104,10 @@
 LOCAL_C_INCLUDES := \
     $(call include-path-for, audio-effects)
 
+LOCAL_HEADER_LIBRARIES := libhardware_headers \
+                          libsystem_headers \
+                          libutils_headers
+
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libeffects
@@ -148,6 +156,10 @@
 
 LOCAL_CFLAGS+= -O2 -fvisibility=hidden
 
+LOCAL_HEADER_LIBRARIES := libhardware_headers \
+                          libsystem_headers \
+                          libutils_headers
+
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
         liblog \
@@ -170,7 +182,7 @@
         external/tinycompress/include
 
 ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)
-  LOCAL_HEADER_LIBRARIES := audio_kernel_headers
+  LOCAL_HEADER_LIBRARIES += audio_kernel_headers
 endif
 ifneq ($(filter sdm670 qcs605 msmnile,$(TARGET_BOARD_PLATFORM)),)
   LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/vendor/qcom/opensource/audio-kernel/include

visualizer/Android.mk

diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index 988620c..61d37da 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -27,6 +27,8 @@
     LOCAL_CFLAGS += -DCAPTURE_DEVICE=7
 endif
 
+LOCAL_HEADER_LIBRARIES := libsystem_headers \
+                          libhardware_headers
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	liblog \

voice_processing/Android.mk

diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index 63db4b1..a39df33 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -22,6 +22,7 @@
 
 LOCAL_SHARED_LIBRARIES += libdl
 
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_CFLAGS += -fvisibility=hidden
 
 LOCAL_CFLAGS += -Wno-unused-variable