summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-07-10 18:40:36 -0500
committerJae Shin2017-10-16 22:09:50 -0500
commit95d7cbb77a5d33370bcc662cf8ba508d849f45d6 (patch)
tree23a2ef291cd58ed7d8347ea24e488cb01fd7a564 /liblog/Android.bp
parent1f64241e2dd1056584a81bf68b57108121fde5cb (diff)
downloadplatform-system-core-95d7cbb77a5d33370bcc662cf8ba508d849f45d6.tar.gz
platform-system-core-95d7cbb77a5d33370bcc662cf8ba508d849f45d6.tar.xz
platform-system-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)
Diffstat (limited to 'liblog/Android.bp')
-rw-r--r--liblog/Android.bp23
1 files changed, 21 insertions, 2 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 = [
42 "logd_writer.c", 42 "logd_writer.c",
43] 43]
44 44
45cc_library_headers {
46 name: "liblog_headers",
47 host_supported: true,
48 vendor_available: true,
49 export_include_dirs: ["include"],
50 target: {
51 windows: {
52 enabled: true,
53 },
54 linux_bionic: {
55 enabled: true,
56 },
57 vendor: {
58 export_include_dirs: ["include_vndk"],
59 },
60 },
61}
62
45// Shared and static library for host and device 63// Shared and static library for host and device
46// ======================================================== 64// ========================================================
47cc_library { 65cc_library {
@@ -78,7 +96,8 @@ cc_library {
78 }, 96 },
79 }, 97 },
80 98
81 export_include_dirs: ["include"], 99 header_libs: ["liblog_headers"],
100 export_header_lib_headers: ["liblog_headers"],
82 101
83 cflags: [ 102 cflags: [
84 "-Werror", 103 "-Werror",
@@ -97,7 +116,7 @@ cc_library {
97} 116}
98 117
99ndk_headers { 118ndk_headers {
100 name: "liblog_headers", 119 name: "liblog_ndk_headers",
101 from: "include/android", 120 from: "include/android",
102 to: "android", 121 to: "android",
103 srcs: ["include/android/log.h"], 122 srcs: ["include/android/log.h"],