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

Commit 1fc8a55b authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

The runtime namespace needs to be visible since libopenjdk is loaded through dlopen(). 

Test: Flash and boot
Test: Flash and boot with Runtime APEX enabled (http://r.android.com/q/topic:art-move-libs-to-runtime-apex)
Bug: 113373927

Change-Id: I555ea988f56d1ee8e7488997a923207de044630f
parent 4d308192

rootdir/etc/ld.config.txt

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ namespace.default.asan.permitted.paths += /apex/com.android.resolv/${LIB} 


# Keep in sync with ld.config.txt in the com.android.runtime APEX.

namespace.default.links = runtime

# 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 += libnativebridge.so

namespace.default.link.runtime.shared_libs += libnativehelper.so

rootdir/etc/ld.config.vndk_lite.txt

+7 −2
Original line number Diff line number Diff line
@@ -55,8 +55,12 @@ namespace.default.asan.search.paths += /%PRODUCT%/${LIB} 
namespace.default.asan.search.paths += /data/asan/product_services/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT_SERVICES%/${LIB}



# Keep in sync with ld.config.txt in the com.android.runtime APEX.

# Keep in sync with the platform namespace in the com.android.runtime APEX

# ld.config.txt.

namespace.default.links = runtime

# 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 += libnativehelper.so

namespace.default.link.runtime.shared_libs += libnativeloader.so
@@ -68,7 +72,8 @@ namespace.default.link.runtime.shared_libs += libnativeloader.so 
###############################################################################

namespace.runtime.isolated = true



# Keep in sync with ld.config.txt in the com.android.runtime APEX.

# Keep in sync with the default namespace in the com.android.runtime APEX

# ld.config.txt.

namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}

namespace.runtime.links = default

# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library