commit 9ce49be616105b7af3a45ae8ebbe138ed9ff8de8
author Dan Willemsen <dwillemsen@google.com> Wed Jun 01 23:47:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 23:47:45 2016 +0000
tree 7f52ca86e641b8b9c69349a6d1c26c62137853d6
parent 680b2f3cb61e29a46d0d6bdf89394dd96e82f201
parent 6b5255722e7497fc7c854cf1ae9e51322bc7ceae

Merge "Fix liblog logtags" am: 59e6afc617
am: 6b5255722e

* commit '6b5255722e7497fc7c854cf1ae9e51322bc7ceae':
  Fix liblog logtags

Change-Id: I6225d8fd338b9ffc5b4406d5dbb92e2816bcaaad

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index 1051016..e32f73c 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -24,7 +24,6 @@
 ]
 liblog_host_sources = [
     "fake_log_device.c",
-    //"event.logtags",
     "fake_writer.c",
 ]
 liblog_target_sources = [
@@ -88,6 +87,7 @@
         "-DLIBLOG_LOG_TAG=1005",
         "-DSNET_EVENT_LOG_TAG=1397638484",
     ],
+    logtags: ["event.logtags"],
     compile_multilib: "both",
     stl: "none",
 }