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

am: 18f2b9f4c0 Change-Id: I896d3fe4bff55a4f2864e1b012ba98441d98f9dc
2016-12-02 18:03:40 +00:00 · 2016-12-02 18:03:40 +00:00 · b8de7b404a
commit b8de7b404a
parent 9e0b1a0a97 18f2b9f4c0
2 changed files with 2 additions and 2 deletions
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@ -27,7 +27,7 @@ liblog_host_sources = [
    "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 @@ cc_library {
            enabled: true,
        },
        not_windows: {
-            srcs: ["event_tag_map.c"],
+            srcs: ["event_tag_map.cpp"],
        },
        linux: {
            host_ldlibs: ["-lrt"],
--- a/liblog/event_tag_map.cpp
+++ b/liblog/event_tag_map.cpp