commit a732601785dc611a602a5972b83da5f0db4ec35b
author Dimitry Ivanov <dimitry@google.com> Mon Oct 03 22:28:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 03 22:28:37 2016 +0000
tree e4f311ac3a8ea105b98e5bde8e2211d81bae9a78
parent 1448b8dc297d0c7862de7933a98c79c8705f4792
parent 66a8f065ef608bb1a4651118fc8dcc796889bb30

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

Change-Id: I6ec33c2aefa86f088701340b73205efab82a422d

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