diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-07-12 21:07:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-12 21:07:26 +0000 |
| commit | f42d02830de827096150fea42e99c55fdb2b7df7 (patch) | |
| tree | 22a36c13c47310d018b8b8368191e5dfb1afd39d | |
| parent | 0c22c5646e7035d367ccf840d1fbe4e5825c35ab (diff) | |
| parent | c30f248cd49926d7441f9219dcaf74d113d5dabd (diff) | |
| download | system_core-f42d02830de827096150fea42e99c55fdb2b7df7.tar.gz system_core-f42d02830de827096150fea42e99c55fdb2b7df7.tar.bz2 system_core-f42d02830de827096150fea42e99c55fdb2b7df7.zip | |
Merge "Add vendor_available to liblog_headers."
| -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 e74aa8283..b98d18ff6 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 { @@ -81,7 +99,8 @@ cc_library { }, }, - export_include_dirs: ["include"], + header_libs: ["liblog_headers"], + export_header_lib_headers: ["liblog_headers"], cflags: [ "-Werror", @@ -100,7 +119,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 00edb4a16..0125eacca 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" ], @@ -79,9 +81,6 @@ cc_library { shared_libs: [ "liblog", ], - export_shared_lib_headers: [ - "liblog", - ], arch: { mips: { |