From f93d732a45356141976844b416a36696bf2efaed Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Mon, 3 Oct 2016 22:18:49 +0000
Subject: [PATCH] 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 955c0ecd6..8624d13f5 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -87,6 +87,12 @@ cc_library {
                 "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"],