diff --git a/adb/Android.bp b/adb/Android.bp index 139ee2347..abd6f32c6 100644 --- a/adb/Android.bp +++ b/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: { diff --git a/liblog/Android.bp b/liblog/Android.bp index 50faa2a3d..0b98e1add 100644 --- a/liblog/Android.bp +++ b/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 ], } diff --git a/libstats/push_compat/Android.bp b/libstats/push_compat/Android.bp index 465c05a37..fcd8c8363 100644 --- a/libstats/push_compat/Android.bp +++ b/libstats/push_compat/Android.bp @@ -35,6 +35,8 @@ cc_defaults { header_libs: ["libstatssocket_headers"], static_libs: [ "libbase", + ], + shared_libs: [ "liblog", "libutils", ],