From 6a452917b34ac2ac6f90840186342f718af54ef0 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 7 Oct 2016 16:22:38 +0000
Subject: [PATCH] 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 | 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"],