Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c0deebf authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

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

am: fd7f9237

Change-Id: I98a351494d6cd9e4f79245bdb9b20fde3dccfe66
parents 80ffd26c fd7f9237

rootdir/etc/ld.config.legacy.txt

+1 −2
Original line number Diff line number Diff line
@@ -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

rootdir/etc/ld.config.txt

+2 −4
Original line number Diff line number Diff line
@@ -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

rootdir/etc/ld.config.vndk_lite.txt

+2 −4
Original line number Diff line number Diff line
@@ -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