summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2016-03-01 15:45:42 -0600
committerColin Cross2016-03-24 15:45:00 -0500
commit93101bea8b918486ea4e3ba470a4a5868db97286 (patch)
tree9d00b04c5e2fc79b5bfbf84d928c12b302b77015 /liblog/Android.bp
parent476b771bdaebf7aa72d41730557fce82cee7faf3 (diff)
downloadplatform-system-core-93101bea8b918486ea4e3ba470a4a5868db97286.tar.gz
platform-system-core-93101bea8b918486ea4e3ba470a4a5868db97286.tar.xz
platform-system-core-93101bea8b918486ea4e3ba470a4a5868db97286.zip
liblog: update Android.bp
Update Android.bp to match the version in AOSP. Change-Id: I93aba0f93a7a8d255073661331f1d966a53e20aa (cherry picked from commit c457a4b73ecc3a7084418a23c6f51cd89d31debd)
Diffstat (limited to 'liblog/Android.bp')
-rw-r--r--liblog/Android.bp24
1 files changed, 18 insertions, 6 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp
index ee883f037..9e8491b72 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -14,20 +14,30 @@
14// limitations under the License. 14// limitations under the License.
15// 15//
16 16
17liblog_host_sources = [ 17liblog_sources = [
18 "logd_write.c", 18 "log_event_list.c",
19 "log_event_write.c", 19 "log_event_write.c",
20 "logger_write.c",
21 "config_write.c",
22 "logger_name.c",
23 "logger_lock.c",
24]
25liblog_host_sources = [
20 "fake_log_device.c", 26 "fake_log_device.c",
21 //"event.logtags", 27 //"event.logtags",
28 "fake_writer.c",
22] 29]
23liblog_target_sources = [ 30liblog_target_sources = [
24 "logd_write.c",
25 "log_event_write.c",
26 "event_tag_map.c", 31 "event_tag_map.c",
32 "config_read.c",
27 "log_time.cpp", 33 "log_time.cpp",
28 "log_is_loggable.c", 34 "log_is_loggable.c",
29 "logprint.c", 35 "logprint.c",
30 "log_read.c", 36 "pmsg_reader.c",
37 "pmsg_writer.c",
38 "logd_reader.c",
39 "logd_writer.c",
40 "logger_read.c",
31] 41]
32 42
33// Shared and static library for host and device 43// Shared and static library for host and device
@@ -36,6 +46,8 @@ cc_library {
36 name: "liblog", 46 name: "liblog",
37 host_supported: true, 47 host_supported: true,
38 48
49 srcs: liblog_sources,
50
39 target: { 51 target: {
40 host: { 52 host: {
41 srcs: liblog_host_sources, 53 srcs: liblog_host_sources,
@@ -64,6 +76,7 @@ cc_library {
64 76
65 cflags: [ 77 cflags: [
66 "-Werror", 78 "-Werror",
79 "-fvisibility=hidden",
67 // This is what we want to do: 80 // This is what we want to do:
68 // liblog_cflags := $(shell \ 81 // liblog_cflags := $(shell \
69 // sed -n \ 82 // sed -n \
@@ -71,7 +84,6 @@ cc_library {
71 // $(LOCAL_PATH)/event.logtags) 84 // $(LOCAL_PATH)/event.logtags)
72 // so make sure we do not regret hard-coding it as follows: 85 // so make sure we do not regret hard-coding it as follows:
73 "-DLIBLOG_LOG_TAG=1005", 86 "-DLIBLOG_LOG_TAG=1005",
74 "-DSNET_EVENT_LOG_TAG=1397638484",
75 ], 87 ],
76 compile_multilib: "both", 88 compile_multilib: "both",
77 stl: "none", 89 stl: "none",