Merge changes from topic 'system-vendor-internal-pick'
* changes:
gralloc: fix dependencies
libhardware: add libaudio_system_headers
libhardware: export system headers
nfc.default: remove unneeded dependency
diff --git a/Android.bp b/Android.bp
index 739cb6d..f6aacd2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,15 @@
cc_library_headers {
name: "libhardware_headers",
+ header_libs: [
+ "libaudio_system_headers",
+ "libsystem_headers",
+ ],
+ export_header_lib_headers: [
+ "libaudio_system_headers",
+ "libsystem_headers"
+ ],
+
export_include_dirs: ["include"],
vendor_available: true,
}
@@ -15,9 +24,11 @@
"liblog",
"libdl",
],
- header_libs: ["libsystem_headers"],
cflags: ["-DQEMU_HARDWARE"],
- export_include_dirs: ["include"],
+
+ header_libs: ["libhardware_headers"],
+ export_header_lib_headers: ["libhardware_headers"],
+
vendor_available: true,
}
diff --git a/modules/gralloc/Android.mk b/modules/gralloc/Android.mk
index 092e851..6b6e60d 100644
--- a/modules/gralloc/Android.mk
+++ b/modules/gralloc/Android.mk
@@ -27,6 +27,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)
diff --git a/modules/nfc/Android.bp b/modules/nfc/Android.bp
index bd93bb5..53ab309 100644
--- a/modules/nfc/Android.bp
+++ b/modules/nfc/Android.bp
@@ -18,6 +18,5 @@
srcs: ["nfc_pn544_example.c"],
shared_libs: [
"liblog",
- "libcutils",
],
}