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

am: 7e86b688cb Change-Id: I90d8fc3b22fc59b04532fba6418b73ad8af998e3
2016-10-07 16:46:29 +00:00 · 2016-10-07 16:46:29 +00:00 · 5e106e0da8
parent 5f3f482c3e 7e86b688cb
commit 5e106e0da8
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"],