Merge "Remove links to libart(d).so in the runtime." am: fdf70f1ba8

am: fd7f92372d

Change-Id: I98a351494d6cd9e4f79245bdb9b20fde3dccfe66
This commit is contained in:
Martin Stjernholm 2019-03-27 10:35:54 -07:00 committed by android-build-merger
commit 0c0deebf98
3 changed files with 5 additions and 10 deletions

View file

@ -54,8 +54,7 @@ namespace.default.asan.links = runtime,resolv
# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by # Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
# libart. # libart.
namespace.default.visible = true 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so

View file

@ -133,8 +133,7 @@ namespace.default.links = runtime,resolv
# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by # Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
# libart. # libart.
namespace.default.visible = true 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.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.links = runtime,resolv
namespace.default.visible = true 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so

View file

@ -74,8 +74,7 @@ namespace.default.links = runtime,resolv
# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by # Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
# libart. # libart.
namespace.default.visible = true 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.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.links = runtime,resolv
namespace.default.visible = true 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 += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so