diff options
| author | Martin Stjernholm <mast@google.com> | 2019-03-27 10:25:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-27 10:25:45 -0700 |
| commit | fd7f92372d8f5e652dd935648ec34a25e6926c2c (patch) | |
| tree | a579708afda141ae1044f352913cb69bfe45edb7 | |
| parent | 4fcd52fdd0d75e45b678eb144650e0fc17da586f (diff) | |
| parent | fdf70f1ba81d8fa0d169dd30f9d61b0630fa2919 (diff) | |
Merge "Remove links to libart(d).so in the runtime."
am: fdf70f1ba8
Change-Id: Ife679137b14d56c18c34552d4babff3ccb083376
| -rw-r--r-- | rootdir/etc/ld.config.legacy.txt | 3 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.txt | 6 | ||||
| -rw-r--r-- | rootdir/etc/ld.config.vndk_lite.txt | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index 9cf93ca02..c23ee9561 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -54,8 +54,7 @@ namespace.default.asan.links = runtime,resolv # Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by # libart. namespace.default.visible = true -namespace.default.link.runtime.shared_libs = libart.so:libartd.so -namespace.default.link.runtime.shared_libs += libdexfile_external.so +namespace.default.link.runtime.shared_libs = libdexfile_external.so namespace.default.link.runtime.shared_libs += libnativebridge.so namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativeloader.so diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 85deacf75..6034f039b 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -133,8 +133,7 @@ namespace.default.links = runtime,resolv # Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by # libart. namespace.default.visible = true -namespace.default.link.runtime.shared_libs = libart.so:libartd.so -namespace.default.link.runtime.shared_libs += libdexfile_external.so +namespace.default.link.runtime.shared_libs = libdexfile_external.so namespace.default.link.runtime.shared_libs += libnativebridge.so namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativeloader.so @@ -577,8 +576,7 @@ namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.links = runtime,resolv namespace.default.visible = true -namespace.default.link.runtime.shared_libs = libart.so:libartd.so -namespace.default.link.runtime.shared_libs += libdexfile_external.so +namespace.default.link.runtime.shared_libs = libdexfile_external.so namespace.default.link.runtime.shared_libs += libnativebridge.so namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativeloader.so diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 26e1dd9ac..d769c3457 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -74,8 +74,7 @@ namespace.default.links = runtime,resolv # Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by # libart. namespace.default.visible = true -namespace.default.link.runtime.shared_libs = libart.so:libartd.so -namespace.default.link.runtime.shared_libs += libdexfile_external.so +namespace.default.link.runtime.shared_libs = libdexfile_external.so namespace.default.link.runtime.shared_libs += libnativebridge.so namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativeloader.so @@ -400,8 +399,7 @@ namespace.default.asan.search.paths += /vendor/${LIB} namespace.default.links = runtime,resolv namespace.default.visible = true -namespace.default.link.runtime.shared_libs = libart.so:libartd.so -namespace.default.link.runtime.shared_libs += libdexfile_external.so +namespace.default.link.runtime.shared_libs = libdexfile_external.so namespace.default.link.runtime.shared_libs += libnativebridge.so namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativeloader.so |