commit 5e7a6523f22e4fb348a32bf761b820c25ffad182
author John Reck <jreck@google.com> Fri Oct 07 16:22:38 2016 +0000
committer John Reck <jreck@google.com> Fri Oct 07 16:22:38 2016 +0000
tree a3c75495cc17f85f045c1daaf5e021f0fdb49ae9
parent 634e1abcf24392f34e9c66275e20f7f80f839611

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

This reverts commit 595c1480d08b95bb2daaf5211e9b886ece13ef2f.

Revert reason: broke bullhead-eng build in master

Change-Id: Ie64fc31c3c971366ab9f2543b91b8f5d2040868b

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