commit a64d50a9e56b220e889b1e528901d19688929318
author Mark Salyzyn <salyzyn@google.com> Fri Dec 16 19:08:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 16 19:08:23 2016 +0000
tree 2d89575a7f771a702183d3b69717446d8361fcfe
parent f994e7043fa0ac1ac8266da05492e0fa34f1458c
parent b1c7515cf5db96286881e7718ee006da9f990a7c

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

Change-Id: I207fd9e243ad689f8ea3234d58c39385c452d71d

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