diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-04-20 01:39:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-20 01:39:23 +0000 |
| commit | d839667cd00b277b2631276ef745d883db58bb3c (patch) | |
| tree | 993444703ac7cd7b3f36f9af8ac5b698e723c362 | |
| parent | 004ea22c72b667c9c3c529f78d8f123ab59bd272 (diff) | |
| parent | b3741e1bc7f5106969fbe705d175e368b40b24f0 (diff) | |
| download | libhardware-d839667cd00b277b2631276ef745d883db58bb3c.tar.gz | |
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
| -rw-r--r-- | Android.bp | 15 | ||||
| -rw-r--r-- | modules/gralloc/Android.mk | 2 | ||||
| -rw-r--r-- | modules/nfc/Android.bp | 1 |
3 files changed, 15 insertions, 3 deletions
@@ -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 @@ cc_library_shared { "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 092e851d..6b6e60dd 100644 --- a/modules/gralloc/Android.mk +++ b/modules/gralloc/Android.mk @@ -27,6 +27,8 @@ LOCAL_SRC_FILES := \ 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 bd93bb5b..53ab309f 100644 --- a/modules/nfc/Android.bp +++ b/modules/nfc/Android.bp @@ -18,6 +18,5 @@ cc_library_shared { srcs: ["nfc_pn544_example.c"], shared_libs: [ "liblog", - "libcutils", ], } |