ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "don't include liblog to APEXes"

Browse source
This commit is contained in:
Jiyong Park 2020-03-11 09:20:24 +00:00 • committed by Gerrit Code Review
commit f1e27502e4
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/Android.bp
View file

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

6
liblog/Android.bp
View file

@ -121,8 +121,12 @@ cc_library {
logtags: ["event.logtags"], logtags: ["event.logtags"],
compile_multilib: "both", compile_multilib: "both",
apex_available: [ apex_available: [
"//apex_available:anyapex",
"//apex_available:platform", "//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
], ],
} }

2
libstats/push_compat/Android.bp
View file

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