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

am: 3e5bb6dc6e Change-Id: I6ec33c2aefa86f088701340b73205efab82a422d
2016-10-03 22:28:37 +00:00 · 2016-10-03 22:28:37 +00:00 · 1814d808f3
commit 1814d808f3
parent e9f4c175f3 3e5bb6dc6e
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"],