diff options
| author | 2019-03-07 14:58:34 +0900 | |
|---|---|---|
| committer | 2019-03-15 09:02:16 +0000 | |
| commit | 94b6c34aade019d6300c4b109885b3b6715d573e (patch) | |
| tree | 05fbdf5b313746939365a4294b922a0734abcce7 | |
| parent | e095c9135a6b28c3e8059a9a55d4c479f3e2c7f3 (diff) | |
Don't bind-mount bionic files
Bind-mounting of the bionic files on /bionic/* paths no longer required
as there are direct symlinks from bionic files in /system partition to
the corresponding bionic files in the runtime APEX. e.g.,
/system/lib/libc.so -> /apex/com.android.runtime/lib/bionic/libc.so
Bug: 125549215
Test: m; devices boots
Test: atest installd_dexopt_test:DexoptTest#DexoptSecondaryCeLink
Change-Id: I47335d103fa1eb12b532daea92521ac0c3d39d7c
| -rw-r--r-- | build/apex/ld.config.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt index 14f251042a..cbadcd81bb 100644 --- a/build/apex/ld.config.txt +++ b/build/apex/ld.config.txt @@ -39,17 +39,17 @@ namespace.platform.link.default.shared_libs += libandroidicu.so # TODO(b/122876336): Remove libpac.so once it's migrated to Webview namespace.platform.link.default.shared_libs += libpac.so -# /system/lib/libc.so, etc are symlinks to /bionic/lib/libc.so, etc. -# Add /bionic/lib 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 /bionic/lib in search.paths. If /bionic/lib -# is after /system/lib, then /bionic/lib 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 = /bionic/${LIB} -namespace.platform.asan.permitted.paths = /bionic/${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 # Note that we don't need to link the default namespace with conscrypt: # the runtime Java code and binaries do not explicitly load native libraries |