Merge "don't include liblog to APEXes"

adb/Android.bp

@@ -589,7 +589,6 @@ cc_binary {
         "libcrypto_utils",
         "libcutils_sockets",
         "libdiagnose_usb",
-        "liblog",
         "libmdnssd",
         "libminijail",
         "libprotobuf-cpp-lite",
@@ -603,6 +602,7 @@ cc_binary {
         "libadbd_auth",
         "libadbd_fs",
         "libcrypto",
+        "liblog",
     ],
 
     target: {

liblog/Android.bp

@@ -121,8 +121,12 @@ cc_library {
     logtags: ["event.logtags"],
     compile_multilib: "both",
     apex_available: [
-        "//apex_available:anyapex",
         "//apex_available:platform",
+        // liblog is exceptionally available to the runtime APEX
+        // because the dynamic linker has to use it statically.
+        // See b/151051671
+        "com.android.runtime",
+        // DO NOT add more apex names here
     ],
 }
 

libstats/push_compat/Android.bp

@@ -35,6 +35,8 @@ cc_defaults {
     header_libs: ["libstatssocket_headers"],
     static_libs: [
         "libbase",
+    ],
+    shared_libs: [
         "liblog",
         "libutils",
     ],