tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove ld.config.txt from adbd APEX" am: 5694a9559b

Browse source 
Change-Id: I92291c853973747891490ab0b9fafca4a15dd7a0
This commit is contained in:
Automerger Merge Worker 2020-02-21 04:19:35 +00:00
commit 187bf6c184
2 changed files with 1 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/apex/Android.bp
View file

@ -8,7 +8,7 @@ apex_defaults {
native_shared_libs: ["libadbconnection_client"],
},
},
prebuilts: ["com.android.adbd.init.rc", "com.android.adbd.ld.config.txt"],
prebuilts: ["com.android.adbd.init.rc"],
key: "com.android.adbd.key",
certificate: ":com.android.adbd.certificate",
@ -29,13 +29,6 @@ apex_test {
installable: false,
}
prebuilt_etc {
name: "com.android.adbd.ld.config.txt",
src: "ld.config.txt",
filename: "ld.config.txt",
installable: false,
}
prebuilt_etc {
name: "com.android.adbd.init.rc",
src: "adbd.rc",

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

@ -1,53 +0,0 @@
# Copyright (C) 2019 The Android Open Source Project
#
# Bionic loader config file for the adbd APEX.
dir.adbd = /apex/com.android.adbd/bin/
[adbd]
additional.namespaces = apex,platform,art
namespace.default.isolated = true
namespace.default.permitted.paths = /system/${LIB}
namespace.default.asan.permitted.paths = /system/${LIB}
namespace.default.links = apex,art,platform
namespace.default.link.apex.shared_libs = libcrypto.so
namespace.default.link.art.shared_libs = libadbconnection_server.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
###############################################################################
namespace.art.isolated = true
namespace.art.search.paths = /apex/com.android.art/${LIB}
namespace.art.asan.search.paths = /apex/com.android.art/${LIB}
namespace.art.links = platform
namespace.art.link.platform.allow_all_shared_libs = true
###############################################################################
# "platform" namespace: used for NDK libraries, and libadbd_auth
###############################################################################
namespace.platform.isolated = true
namespace.platform.search.paths = /system/${LIB}
namespace.platform.asan.search.paths = /data/asan/system/${LIB}
# /system/lib/libc.so, etc are symlinks to
# /apex/com.android.runtime/lib/bionic/libc.so, etc. Add the path to the
# permitted paths because linker uses realpath(3) to check the accessibility
# of the lib. We could add this to search.paths instead but that makes the
# resolution of bionic libs be dependent on the order of /system/lib and
# /apex/.../lib/bionic in search.paths. If the latter is after the former,
# then the latter is never tried because libc.so is always found in
# /system/lib but fails to pass the accessibility test because of its realpath.
# It's better to not depend on the ordering if possible.
namespace.platform.permitted.paths = /apex/com.android.runtime/${LIB}/bionic
namespace.platform.asan.permitted.paths = /apex/com.android.runtime/${LIB}/bionic