commit db1e11badb60a9e0630f4e46d91993e36d5cd351
author Dimitry Ivanov <dimitry@google.com> Mon Oct 03 22:18:49 2016 +0000
committer Dimitry Ivanov <dimitry@google.com> Mon Oct 03 22:18:49 2016 +0000
tree a3c75495cc17f85f045c1daaf5e021f0fdb49ae9
parent c3227c9ef46835c55152635053c8b7ddce74666e

Revert "Remove liblog from libcutils as a whole static lib"

This reverts commit 6dd58c00ca797de55361d2df455c1f9434811b9e.

Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: I519d77de118f02346a4f89b197ca4df7e9f883ac

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"],