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

Merge "adbd: actually dynamically link against libadbd_auth."

Browse source
This commit is contained in:
Josh Gao 2020-02-03 20:15:20 +00:00 • committed by Gerrit Code Review
commit d5bad7c021
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/Android.bp
View file

@ -29,6 +29,7 @@ cc_defaults {
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1", "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1",
], ],
cpp_std: "experimental", cpp_std: "experimental",
stl: "libc++_static",
use_version_lib: true, use_version_lib: true,
compile_multilib: "first", compile_multilib: "first",
@ -364,8 +365,6 @@ cc_binary_host {
"libz", "libz",
], ],
stl: "libc++_static",
// Don't add anything here, we don't want additional shared dependencies // Don't add anything here, we don't want additional shared dependencies
// on the host adb tool, and shared libraries that link against libc++ // on the host adb tool, and shared libraries that link against libc++
// will violate ODR // will violate ODR
@ -558,11 +557,9 @@ cc_binary {
keep_symbols: true, keep_symbols: true,
}, },
stl: "libc++_static",
static_libs: [ static_libs: [
"libadbconnection_server", "libadbconnection_server",
"libadbd", "libadbd",
"libadbd_auth",
"libadbd_services", "libadbd_services",
"libasyncio", "libasyncio",
"libbase", "libbase",
@ -577,6 +574,7 @@ cc_binary {
], ],
shared_libs: [ shared_libs: [
"libadbd_auth",
"libcrypto", "libcrypto",
], ],
} }
@ -585,7 +583,6 @@ phony {
name: "adbd_system_binaries", name: "adbd_system_binaries",
required: [ required: [
"abb", "abb",
"libadbd_auth",
"reboot", "reboot",
"set-verity-state", "set-verity-state",
] ]
@ -739,7 +736,6 @@ cc_library_host_static {
"libziparchive", "libziparchive",
"libz", "libz",
], ],
stl: "libc++_static",
proto: { proto: {
type: "lite", type: "lite",
export_proto_headers: true, export_proto_headers: true,

18
adb/apex/ld.config.txt
View file

@ -5,16 +5,24 @@
dir.adbd = /apex/com.android.adbd/bin/ dir.adbd = /apex/com.android.adbd/bin/
[adbd] [adbd]
additional.namespaces = platform,art additional.namespaces = apex,platform,art
namespace.default.isolated = true namespace.default.isolated = true
namespace.default.search.paths = /apex/com.android.adbd/${LIB}
namespace.default.asan.search.paths = /apex/com.android.adbd/${LIB}
namespace.default.permitted.paths = /system/${LIB} namespace.default.permitted.paths = /system/${LIB}
namespace.default.asan.permitted.paths = /system/${LIB} namespace.default.asan.permitted.paths = /system/${LIB}
namespace.default.links = art,platform namespace.default.links = apex,art,platform
namespace.default.link.apex.shared_libs = libcrypto.so
namespace.default.link.art.shared_libs = libadbconnection_server.so namespace.default.link.art.shared_libs = libadbconnection_server.so
namespace.default.link.platform.shared_libs = libc.so:libdl.so:libm.so:libclang_rt.hwasan-aarch64-android.so
# libcrypto.so in the APEX might be a symlink to /system, for APEXes bundled with the system image.
# The dynamic linker works off of realpath, so we need to permit loading libcrypto.so from /system.
namespace.default.link.platform.shared_libs = libc.so:libdl.so:libm.so:libclang_rt.hwasan-aarch64-android.so:liblog.so:libadbd_auth.so:libcrypto.so
namespace.apex.isolated = true
namespace.apex.search.paths = /apex/com.android.adbd/${LIB}
namespace.apex.asan.search.paths = /apex/com.android.adbd/${LIB}
namespace.apex.links = platform
namespace.apex.link.platform.allow_all_shared_libs = true
############################################################################### ###############################################################################
# "art" APEX namespace: used for libadbdconnection_server # "art" APEX namespace: used for libadbdconnection_server