commit ad8998b8327d19a8f58bff59bc9e71e1d4e556b8
author Mark Salyzyn <salyzyn@google.com> Fri Dec 16 19:22:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 16 19:22:54 2016 +0000
tree 6d2bfdf9812265c250d04b881c51d0d3dd408eff
parent f66fbb0299b59c87aaf14d07094741abb4f52039
parent f180af983205dc2487b697c51fda2024e5171878

Merge "liblog: move log_is_loggable.c to properties.c" am: 3ef8ad8548 am: ebb7a0dbc5
am: 014fd15779

Change-Id: If409655d3c0d82ba338b841fddd1c97593cb0778

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index e59a460..2424dba 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -30,7 +30,7 @@
     "event_tag_map.cpp",
     "config_read.c",
     "log_time.cpp",
-    "log_is_loggable.c",
+    "properties.c",
     "logprint.c",
     "pmsg_reader.c",
     "pmsg_writer.c",

liblog/properties.c

diff --git a/liblog/log_is_loggable.c b/liblog/properties.c
similarity index 100%
rename from liblog/log_is_loggable.c
rename to liblog/properties.c