commit 12f0dbe5edf99dc6cea3427fc465ae564e444295
author Mark Salyzyn <salyzyn@google.com> Fri Dec 02 18:11:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 02 18:11:10 2016 +0000
tree 924429df8026551eef5bbc00c3b88670f909ea74
parent a29f45900b3e4c565fc70b9943635a36b006fa08
parent 6282053b9fe121c67699b5c0e010f1297123f125

Merge "liblog: switch event_tag_map.c to event_tag_map.cpp" am: 48dfc220cb am: 18f2b9f4c0
am: b8de7b404a

Change-Id: I715b9f79570412b93e32cac5e6904427d9917089

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index c498153..e59a460 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -27,7 +27,7 @@
     "fake_writer.c",
 ]
 liblog_target_sources = [
-    "event_tag_map.c",
+    "event_tag_map.cpp",
     "config_read.c",
     "log_time.cpp",
     "log_is_loggable.c",
@@ -68,7 +68,7 @@
             enabled: true,
         },
         not_windows: {
-            srcs: ["event_tag_map.c"],
+            srcs: ["event_tag_map.cpp"],
         },
         linux: {
             host_ldlibs: ["-lrt"],

liblog/event_tag_map.cpp

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