commit c77eac1cabb4bd78dc6fbca43cf162a9acede2d4
author Dimitry Ivanov <dimitry@google.com> Mon Oct 03 22:33:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 03 22:33:41 2016 +0000
tree 4e6b727ced130888a2dd13ca82367dbbc6cc8309
parent e7faa71b85bd83f5fe1e3a796a228d8cfa115db0
parent a732601785dc611a602a5972b83da5f0db4ec35b

Merge "Revert "Remove liblog from libcutils as a whole static lib"" am: d4446ccce8 am: 3e5bb6dc6e
am: 1814d808f3

Change-Id: If6507fc771cce958f0cbfe7ecc18407826494326

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