commit 73b1ac878ba6c31e29ba796f2b3716b31faeed7f
author Tom Cherry <tomcherry@google.com> Wed Sep 16 22:07:02 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 16 22:07:02 2020 +0000
tree ef37798cd34b0c2ccc2b93a072bb7f7c456ac074
parent 46ec1a561d8052765ce90995537d0708c968b041
parent 3d8b739f94a69d7a49823b563f2887b5629f1f95

Merge "Remove include/private/android_logger.h"

include/private/android_logger.h

diff --git a/include/private/android_logger.h b/include/private/android_logger.h
deleted file mode 120000
index f187a6d..0000000
--- a/include/private/android_logger.h
+++ /dev/null
@@ -1 +0,0 @@
-../../liblog/include/private/android_logger.h
\ No newline at end of file

libstats/socket/Android.bp

diff --git a/libstats/socket/Android.bp b/libstats/socket/Android.bp
index bf79ea2..89cdfe5 100644
--- a/libstats/socket/Android.bp
+++ b/libstats/socket/Android.bp
@@ -29,6 +29,7 @@
     static_libs: [
         "libcutils", // does not expose a stable C API
     ],
+    header_libs: ["liblog_headers"],
     cflags: [
         "-Wall",
         "-Werror",

logd/Android.bp

diff --git a/logd/Android.bp b/logd/Android.bp
index 7f67ab0..fe22d1c 100644
--- a/logd/Android.bp
+++ b/logd/Android.bp
@@ -66,6 +66,7 @@
         "SerializedLogChunk.cpp",
         "SimpleLogBuffer.cpp",
     ],
+    static_libs: ["liblog"],
     logtags: ["event.logtags"],
 
     export_include_dirs: ["."],