diff options
| author | Martin Stjernholm <mast@google.com> | 2019-03-28 12:37:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-28 12:37:29 +0000 |
| commit | 60de3486541b26cf639f6d43acd98a044c1b0c81 (patch) | |
| tree | 863bdbd40f5d396d543b5aa1f570851d1b410bf8 | |
| parent | 5aa37dc3dc58583db44662354e54679b809d2522 (diff) | |
| parent | adf4503de10b5af9c4ca4327d9a29e6851f8b2c7 (diff) | |
| download | system_core-60de3486541b26cf639f6d43acd98a044c1b0c81.tar.gz system_core-60de3486541b26cf639f6d43acd98a044c1b0c81.tar.bz2 system_core-60de3486541b26cf639f6d43acd98a044c1b0c81.zip | |
Merge "Apply the standard system linker config to all of /data."
| -rw-r--r-- | rootdir/etc/ld.config.legacy.txt | 9 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 9 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.vndk_lite.txt | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index c23ee9561..0fccd312c 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -11,14 +11,13 @@ dir.legacy = /vendor dir.legacy = /odm dir.legacy = /sbin -dir.legacy = /data/nativetest -dir.legacy = /data/nativetest64 -dir.legacy = /data/benchmarktest -dir.legacy = /data/benchmarktest64 - # Except for /postinstall, where only /system and /product are searched dir.postinstall = /postinstall +# Fallback entry to provide APEX namespace lookups for binaries anywhere else. +# This must be last. +dir.legacy = /data + [legacy] namespace.default.isolated = false diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 6034f039b..2b0ef4cb6 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -27,13 +27,12 @@ dir.unrestricted = /data/nativetest64/unrestricted # necessary) the unrestricted subdirs above. Then clean this up. dir.unrestricted = /data/local/tmp -dir.system = /data/nativetest -dir.system = /data/nativetest64 -dir.system = /data/benchmarktest -dir.system = /data/benchmarktest64 - dir.postinstall = /postinstall +# Fallback entry to provide APEX namespace lookups for binaries anywhere else. +# This must be last. +dir.system = /data + [system] additional.namespaces = runtime,conscrypt,media,resolv,sphal,vndk,rs diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index d769c3457..c8312df39 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -27,13 +27,12 @@ dir.unrestricted = /data/nativetest64/unrestricted # necessary) the unrestricted subdirs above. Then clean this up. dir.unrestricted = /data/local/tmp -dir.system = /data/nativetest -dir.system = /data/nativetest64 -dir.system = /data/benchmarktest -dir.system = /data/benchmarktest64 - dir.postinstall = /postinstall +# Fallback entry to provide APEX namespace lookups for binaries anywhere else. +# This must be last. +dir.system = /data + [system] additional.namespaces = runtime,conscrypt,media,resolv,sphal,vndk,rs |