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

am: 1814d808f3 Change-Id: If6507fc771cce958f0cbfe7ecc18407826494326
2016-10-03 22:33:41 +00:00 · 2016-10-03 22:33:41 +00:00 · 897fa44319
parent 17c88c7743 1814d808f3
commit 897fa44319
1 changed files with 6 additions and 0 deletions
--- 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"],