diff options
| author | Martin Stjernholm <mast@google.com> | 2018-12-21 22:32:48 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2018-12-21 22:40:37 +0000 |
| commit | 8ab9c5704dc12a3c8a0b8d293b687941afecd736 (patch) | |
| tree | 7ead6bc2701870b122a9d9ef18dad1d41bb2d776 /build | |
| parent | 46a8938026c425d54f2c02631ca584b4d1f2666c (diff) | |
| download | art-8ab9c5704dc12a3c8a0b8d293b687941afecd736.tar.gz art-8ab9c5704dc12a3c8a0b8d293b687941afecd736.tar.bz2 art-8ab9c5704dc12a3c8a0b8d293b687941afecd736.zip | |
Configure the full set of libraries for switching back from platform to
runtime (aka default) namespaces.
In CTS dalvikvm loads libandroid.so which is only in /system/lib, and then
that loads libnativehelper.so which should be loaded from the APEX again.
It's not certain this list needs to be a full copy of the list of
namespace.default.link.runtime.shared_libs in
system/core/rootdir/etc/ld.config.txt, but it's simpler that way.
Bug: 121384464
Bug: 119867084
Bug: 113373927
Test: Flash and reboot device
Test: atest --test-mapping cts/tools/vm-tests-tf/TEST_MAPPING
Test: cts-tradefed run commandAndExit cts-dev -m CtsJniTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsCompilationTestCases
Change-Id: Iecd27b8c9d4b7b80141f8a7f9eb6f062f3885206
Diffstat (limited to 'build')
| -rw-r--r-- | build/apex/ld.config.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt index 69e6543f75..014b1152c6 100644 --- a/build/apex/ld.config.txt +++ b/build/apex/ld.config.txt @@ -24,4 +24,8 @@ namespace.default.link.platform.allow_all_shared_libs = true namespace.platform.isolated = true namespace.platform.search.paths = /system/${LIB} namespace.platform.links = default -namespace.platform.link.default.shared_libs = libc.so:libdl.so:libm.so +namespace.platform.link.default.shared_libs = libc.so:libdl.so:libm.so +namespace.platform.link.default.shared_libs += libart.so:libartd.so +namespace.platform.link.default.shared_libs += libnativebridge.so +namespace.platform.link.default.shared_libs += libnativehelper.so +namespace.platform.link.default.shared_libs += libnativeloader.so |