Merge "Hid Utilities for HID based dynamic sensor" into oc-dev
diff --git a/Android.bp b/Android.bp
index f3426e8..f6aacd2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,8 +2,14 @@
cc_library_headers {
name: "libhardware_headers",
- header_libs: ["libsystem_headers"],
- export_header_lib_headers: ["libsystem_headers"],
+ header_libs: [
+ "libaudio_system_headers",
+ "libsystem_headers",
+ ],
+ export_header_lib_headers: [
+ "libaudio_system_headers",
+ "libsystem_headers"
+ ],
export_include_dirs: ["include"],
vendor_available: true,
diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk
index cdd8d07..ff5808d 100644
--- a/modules/gralloc/Android.mk
+++ b/modules/gralloc/Android.mk
@@ -28,6 +28,8 @@
framebuffer.cpp \
mapper.cpp
+LOCAL_HEADER_LIBRARIES := libhardware_headers
+
LOCAL_MODULE := gralloc.default
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers
ifeq ($(TARGET_USE_PAN_DISPLAY),true)