Merge "Statically link liblog to logd/logcat and their tests"

am: 77d895b739

Change-Id: I68cdff95f0143b87d9d4453aa350ad1720637e58

logcat/Android.bp

@@ -25,9 +25,9 @@ cc_defaults {
     shared_libs: [
         "libbase",
         "libcutils",
-        "liblog",
         "libpcrecpp",
     ],
+    static_libs: ["liblog"],
     logtags: ["event.logtags"],
 }
 

logcat/tests/Android.bp

@@ -48,10 +48,8 @@ cc_benchmark {
 cc_test {
     name: "logcat-unit-tests",
     defaults: ["logcat-tests-defaults"],
-    shared_libs: [
-        "liblog",
-        "libbase",
-    ],
+    shared_libs: ["libbase"],
+    static_libs: ["liblog"],
     srcs: [
         "logcat_test.cpp",
         "logcatd_test.cpp",

logd/Android.bp

@@ -63,11 +63,13 @@ cc_binary {
 
     srcs: ["main.cpp"],
 
-    static_libs: ["liblogd"],
+    static_libs: [
+        "liblog",
+        "liblogd",
+    ],
 
     shared_libs: [
         "libsysutils",
-        "liblog",
         "libcutils",
         "libbase",
         "libpackagelistparser",

logd/tests/Android.bp

@@ -38,9 +38,9 @@ cc_defaults {
     shared_libs: [
         "libbase",
         "libcutils",
-        "liblog",
         "libselinux",
     ],
+    static_libs: ["liblog"],
 }
 
 // Build tests for the logger. Run with: