ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: update Android.bp" into nyc-dev

Browse source
This commit is contained in:
Colin Cross 2016-03-25 19:54:24 +00:00 • committed by Android (Google) Code Review
commit 033bc9f3e7
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
liblog/Android.bp
View file

@ -14,20 +14,30 @@
// limitations under the License. // limitations under the License.
// //
liblog_host_sources = [ liblog_sources = [
"logd_write.c", "log_event_list.c",
"log_event_write.c", "log_event_write.c",
"logger_write.c",
"config_write.c",
"logger_name.c",
"logger_lock.c",
]
liblog_host_sources = [
"fake_log_device.c", "fake_log_device.c",
//"event.logtags", //"event.logtags",
"fake_writer.c",
] ]
liblog_target_sources = [ liblog_target_sources = [
"logd_write.c",
"log_event_write.c",
"event_tag_map.c", "event_tag_map.c",
"config_read.c",
"log_time.cpp", "log_time.cpp",
"log_is_loggable.c", "log_is_loggable.c",
"logprint.c", "logprint.c",
"log_read.c", "pmsg_reader.c",
"pmsg_writer.c",
"logd_reader.c",
"logd_writer.c",
"logger_read.c",
] ]
// Shared and static library for host and device // Shared and static library for host and device
@ -36,6 +46,8 @@ cc_library {
name: "liblog", name: "liblog",
host_supported: true, host_supported: true,
srcs: liblog_sources,
target: { target: {
host: { host: {
srcs: liblog_host_sources, srcs: liblog_host_sources,
@ -64,6 +76,7 @@ cc_library {
cflags: [ cflags: [
"-Werror", "-Werror",
"-fvisibility=hidden",
// This is what we want to do: // This is what we want to do:
// liblog_cflags := $(shell \ // liblog_cflags := $(shell \
// sed -n \ // sed -n \
@ -71,7 +84,6 @@ cc_library {
// $(LOCAL_PATH)/event.logtags) // $(LOCAL_PATH)/event.logtags)
// so make sure we do not regret hard-coding it as follows: // so make sure we do not regret hard-coding it as follows:
"-DLIBLOG_LOG_TAG=1005", "-DLIBLOG_LOG_TAG=1005",
"-DSNET_EVENT_LOG_TAG=1397638484",
], ],
compile_multilib: "both", compile_multilib: "both",
stl: "none", stl: "none",