From 5c074e0ab9f98f2ba47c76c3a57a617ede0a8436 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 1 Mar 2019 14:14:58 +0000 Subject: [PATCH] Remove links to libart(d).so in the runtime. They are not needed since the binaries and relevant exported libraries have moved to the Runtime APEX. Test: Flash and boot Test: atest CtsJniTestCases CtsJdwpTestCases Bug: 119867084 Change-Id: If416fbae7057aec02059bb31a4dcd8b63dcc0cad --- rootdir/etc/ld.config.legacy.txt | 3 +-- rootdir/etc/ld.config.txt | 6 ++---- 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