commit fb9cdd1e3100f22c44f26efb2caaaa01c9666c15
author Mark Salyzyn <salyzyn@google.com> Fri Dec 16 19:30:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 16 19:30:25 2016 +0000
tree 802b62a40b97918f72f9176cb3e4c9e567fb5379
parent 889ae38ec425a2ba96553889b7f0ea7c5fd0280f
parent ad8998b8327d19a8f58bff59bc9e71e1d4e556b8

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

Change-Id: I04abcf153f45fbeb1963438288f4c451d19561ad

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