summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-07-10 18:40:36 -0500
committerSteven Moreland2017-09-06 14:55:32 -0500
commit25db8dc21b37ae93e2d764aff86445781aa9d185 (patch)
treee2646b09aef64fa5eb0192010dc55eb0ba5b79e3 /liblog/Android.bp
parente2c51809f70387a6ceddc89966b48aaee17ac402 (diff)
downloadplatform-system-core-25db8dc21b37ae93e2d764aff86445781aa9d185.tar.gz
platform-system-core-25db8dc21b37ae93e2d764aff86445781aa9d185.tar.xz
platform-system-core-25db8dc21b37ae93e2d764aff86445781aa9d185.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 Change-Id: I7b2d9e77e313e3f2ef362a19a03f4c23874d589a Merged-In: I3a85385f588b84393c57fd6d1bcac620f708f0f1
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 e74aa8283..b98d18ff6 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 {
@@ -81,7 +99,8 @@ cc_library {
81 }, 99 },
82 }, 100 },
83 101
84 export_include_dirs: ["include"], 102 header_libs: ["liblog_headers"],
103 export_header_lib_headers: ["liblog_headers"],
85 104
86 cflags: [ 105 cflags: [
87 "-Werror", 106 "-Werror",
@@ -100,7 +119,7 @@ cc_library {
100} 119}
101 120
102ndk_headers { 121ndk_headers {
103 name: "liblog_headers", 122 name: "liblog_ndk_headers",
104 from: "include/android", 123 from: "include/android",
105 to: "android", 124 to: "android",
106 srcs: ["include/android/log.h"], 125 srcs: ["include/android/log.h"],