Use generated kernel headers

Change-Id: I797b0ac4c6cdaae4d4cda0520846723e7467a19b

1 files changed, 20 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index 75e6358..24d587d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@ LOCAL_SRC_FILES := sound_trigger_hw_iaxxx.c cvq_util.c
 LOCAL_VENDOR_MODULE := true
 LOCAL_C_INCLUDES += external/tinyalsa/include \
 			$(call include-path-for, audio-route)
-LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES := libhardware_headers generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils \
 			libtinyalsa \
@@ -44,6 +44,7 @@ LOCAL_MODULE := adnc_strm.primary.default
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := adnc_strm.c
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils \
 			libtinyalsa \
@@ -60,6 +61,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libtunnel
 LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := tunnel.c
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils
 
@@ -70,6 +72,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libodsp
 LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := iaxxx_odsp_hw.c
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils
 LOCAL_MODULE_TAGS := optional
@@ -84,6 +87,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := tests/tunnel_test.c \
 			tests/conversion_routines.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils \
 			libtunnel
@@ -98,6 +102,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := sensor_param_test
 LOCAL_SRC_FILES := tests/sensor_param_test.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libutils \
 			libcutils \
@@ -113,7 +118,7 @@ LOCAL_SRC_FILES := tests/oslo_sound_model_control.cpp \
 			tests/oslo_iaxxx_sensor_control.c
 LOCAL_C_INCLUDES += external/tinyalsa/include \
 			$(call include-path-for, audio-route)
-LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES := libhardware_headers generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libutils \
 			libcutils \
@@ -130,7 +135,7 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := oslo_data_injection_test
 LOCAL_SRC_FILES := tests/oslo_data_injection_test.c
 LOCAL_32_BIT_ONLY := true
-LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES := libhardware_headers generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libutils \
 			libcutils \
@@ -143,7 +148,7 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := oslo_config_test
 LOCAL_SRC_FILES := tests/oslo_config_test.c
 LOCAL_32_BIT_ONLY := true
-LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES := libhardware_headers generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libutils \
 			libcutils \
@@ -155,7 +160,7 @@ include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := oslo_get_stats
 LOCAL_SRC_FILES := tests/oslo_get_stats.c
-LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES := libhardware_headers generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libutils \
 			libcutils \
@@ -169,6 +174,7 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := spi_reliability_test
 LOCAL_SRC_FILES := tests/spi_reliability_test.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils
 
@@ -180,6 +186,7 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := oslo_package_test
 LOCAL_SRC_FILES := ./tests/oslo_package_test.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils \
 			libtinyalsa
@@ -192,6 +199,7 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := tunneling_hal_test_sensor
 LOCAL_SRC_FILES := tests/tunnel_test_sensor.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog
 
 include $(BUILD_EXECUTABLE)
@@ -204,6 +212,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := tests/odsp_api_test.c
 LOCAL_C_INCLUDES += ./tests/
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog \
 			libcutils \
 			libodsp
@@ -217,6 +226,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := dump_debug_info
 LOCAL_SRC_FILES := tests/dump_debug_info.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog
 
 include $(BUILD_EXECUTABLE)
@@ -228,6 +238,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := crash_event_logger
 LOCAL_SRC_FILES := tests/crash_event_logger.c tests/crash_analyzer.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_MODULE_TAGS := optional
 
@@ -239,6 +250,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := setparamblk_test
 LOCAL_SRC_FILES := tests/setparamblk_test.c
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := libcutils \
 			libodsp
 
@@ -250,6 +262,7 @@ LOCAL_SRC_FILES := tests/crash_trigger_test.c
 LOCAL_VENDOR_MODULE := true
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../hal
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := liblog libodsp
 
 include $(BUILD_EXECUTABLE)
@@ -260,6 +273,7 @@ LOCAL_SRC_FILES := tests/plugin_status_test.c
 LOCAL_VENDOR_MODULE := true
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := libcutils libodsp
 
 include $(BUILD_EXECUTABLE)
@@ -270,6 +284,7 @@ LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := tests/get_pwr_stats.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/
 LOCAL_32_BIT_ONLY := true
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 LOCAL_SHARED_LIBRARIES := libcutils liblog
 
 include $(BUILD_EXECUTABLE)