commit a6e34dcc47fd17d9c00a47d64288fb326e71613c
author John Reck <jreck@google.com> Fri Oct 07 16:46:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 07 16:46:29 2016 +0000
tree 814b621a0966a6873125c22d49dae32176ac9343
parent 00e00aa410de43246a16ea7bdfc899605f8e4a0d
parent da40e22def84ac6d750a5e542d0bbcbaf7de4858

Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" am: b02a355d10 am: 8e7fa9fb7e
am: 7e86b688cb

Change-Id: I90d8fc3b22fc59b04532fba6418b73ad8af998e3

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 955c0ec..8624d13 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -87,6 +87,12 @@
                 "uevent.c",
             ],
 
+            // TODO: remove liblog as whole static library, once we don't have prebuilt that requires
+            // liblog symbols present in libcutils.
+            whole_static_libs: [
+                "liblog",
+            ],
+
             static_libs: ["libdebuggerd_client"],
             export_static_lib_headers: ["libdebuggerd_client"],