commit 2577ac2cadce434e6f5185d5327bc8c65b9c6f88
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 19 21:23:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 19 21:23:08 2017 +0000
tree 6101e022783be721baf77d8b6f1e565e4df90fbe
parent 4f142b80e714e5fff510c8767763029ca604bc98
parent 5beee10b17e676380727da0b16b98ba7568669ec

Merge "Hid Utilities for HID based dynamic sensor" into oc-dev

Android.bp

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,

modules/gralloc/Android.mk

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)