commit da40e22def84ac6d750a5e542d0bbcbaf7de4858
author John Reck <jreck@google.com> Fri Oct 07 16:41:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 07 16:41:57 2016 +0000
tree 2388b92280d41cf365352ef8c014075a766080b3
parent baebfc88bc370adb7774c78e0e08e4700f9a50eb
parent 1a0ffb4736a81957f54c2933fd95eb02eef4f5b1

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

Change-Id: Ia5387836b2f07edff773dbe700e93552f3eed85b

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