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

Commit 9c72fb6f authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge changes from topic "art-without-bionic" 

am: 0c100685

Change-Id: I814ac6be70ff8ec197b71d2b68578fba75ac3b4a
parents 4c063099 0c100685

rootdir/etc/ld.config.legacy.txt

+5 −2
Original line number Diff line number Diff line
@@ -85,8 +85,11 @@ namespace.runtime.isolated = true 
# android_link_namespaces in libnativeloader.

namespace.runtime.visible = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = default

# Need allow_all_shared_libs because libart.so can dlopen oat files in

# /system/framework and /data.

rootdir/etc/ld.config.txt

+15 −6
Original line number Diff line number Diff line
@@ -166,8 +166,11 @@ namespace.runtime.isolated = true 
# android_link_namespaces in libnativeloader.

namespace.runtime.visible = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = default

# Need allow_all_shared_libs because libart.so can dlopen oat files in

# /system/framework and /data.
@@ -489,8 +492,11 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so 
###############################################################################

namespace.runtime.isolated = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = system

# TODO(b/130340935): Use a dynamically created linker namespace similar to

# classloader-namespace for oat files, and tighten this up.
@@ -696,8 +702,11 @@ namespace.runtime.isolated = true 
# android_link_namespaces in libnativeloader.

namespace.runtime.visible = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = default

# TODO(b/130340935): Use a dynamically created linker namespace similar to

# classloader-namespace for oat files, and tighten this up.

rootdir/etc/ld.config.vndk_lite.txt

+15 −6
Original line number Diff line number Diff line
@@ -105,8 +105,11 @@ namespace.runtime.isolated = true 
# android_link_namespaces in libnativeloader.

namespace.runtime.visible = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = default

# Need allow_all_shared_libs because libart.so can dlopen oat files in

# /system/framework and /data.
@@ -419,8 +422,11 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so 
###############################################################################

namespace.runtime.isolated = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = default

# TODO(b/130340935): Use a dynamically created linker namespace similar to

# classloader-namespace for oat files, and tighten this up.
@@ -503,8 +509,11 @@ namespace.runtime.isolated = true 
# android_link_namespaces in libnativeloader.

namespace.runtime.visible = true



# TODO(b/139408016): Split the namespaces for the ART and Runtime APEXes

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

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

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

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

namespace.runtime.links = default

# TODO(b/130340935): Use a dynamically created linker namespace similar to

# classloader-namespace for oat files, and tighten this up.