diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-10 16:40:36 -0700 |
|---|---|---|
| committer | Jae Shin <jaeshin@google.com> | 2017-10-17 12:09:50 +0900 |
| commit | 95d7cbb77a5d33370bcc662cf8ba508d849f45d6 (patch) | |
| tree | 23a2ef291cd58ed7d8347ea24e488cb01fd7a564 | |
| parent | 1f64241e2dd1056584a81bf68b57108121fde5cb (diff) | |
| download | core-95d7cbb77a5d33370bcc662cf8ba508d849f45d6.tar.gz core-95d7cbb77a5d33370bcc662cf8ba508d849f45d6.tar.bz2 core-95d7cbb77a5d33370bcc662cf8ba508d849f45d6.zip | |
Add vendor_available to liblog_headers.
Renamed NDK headers to "liblog_ndk_headers"
(these names aren't used anywhere).
libutils_headers now properly export liblog_headers.
Test: with BOARD_VNDK_VERSION=current
Merged-In: I3a85385f588b84393c57fd6d1bcac620f708f0f1
Change-Id: I3a85385f588b84393c57fd6d1bcac620f708f0f1
(cherry picked from commit 42b485cc538217fa127996a340229f76b7c4031b)
| -rw-r--r-- | liblog/Android.bp | 23 | ||||
| -rw-r--r-- | libutils/Android.bp | 5 |
2 files changed, 23 insertions, 5 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp index 6584c952d..d5bb29ed0 100644 --- a/liblog/Android.bp +++ b/liblog/Android.bp @@ -42,6 +42,24 @@ liblog_target_sources = [ "logd_writer.c", ] +cc_library_headers { + name: "liblog_headers", + host_supported: true, + vendor_available: true, + export_include_dirs: ["include"], + target: { + windows: { + enabled: true, + }, + linux_bionic: { + enabled: true, + }, + vendor: { + export_include_dirs: ["include_vndk"], + }, + }, +} + // Shared and static library for host and device // ======================================================== cc_library { @@ -78,7 +96,8 @@ cc_library { }, }, - export_include_dirs: ["include"], + header_libs: ["liblog_headers"], + export_header_lib_headers: ["liblog_headers"], cflags: [ "-Werror", @@ -97,7 +116,7 @@ cc_library { } ndk_headers { - name: "liblog_headers", + name: "liblog_ndk_headers", from: "include/android", to: "android", srcs: ["include/android/log.h"], diff --git a/libutils/Android.bp b/libutils/Android.bp index 540c445d0..1bf5a64ff 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -18,10 +18,12 @@ cc_library_headers { host_supported: true, header_libs: [ + "liblog_headers", "libsystem_headers", "libcutils_headers" ], export_header_lib_headers: [ + "liblog_headers", "libsystem_headers", "libcutils_headers" ], @@ -85,9 +87,6 @@ cc_library { shared_libs: [ "liblog", ], - export_shared_lib_headers: [ - "liblog", - ], arch: { mips: { |