tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "art-without-bionic"

Browse source 
am: 0c100685dc

Change-Id: I814ac6be70ff8ec197b71d2b68578fba75ac3b4a
This commit is contained in:
Martin Stjernholm 2019-09-02 03:46:05 -07:00 committed by android-build-merger
commit 9c72fb6f08
3 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rootdir/etc/ld.config.legacy.txt
View file

@ -85,8 +85,11 @@ namespace.runtime.isolated = true
# android_link_namespaces in libnativeloader.
namespace.runtime.visible = true
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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.

21
rootdir/etc/ld.config.txt
View file

@ -166,8 +166,11 @@ namespace.runtime.isolated = true
# android_link_namespaces in libnativeloader.
namespace.runtime.visible = true
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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.

21
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -105,8 +105,11 @@ namespace.runtime.isolated = true
# android_link_namespaces in libnativeloader.
namespace.runtime.visible = true
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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
namespace.runtime.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
# 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.