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

Revert "Include com.android.runtime in the "runtime" linker namespace."

Browse source 
No longer required for hwasan builds, since b/140790209 is fixed.

This reverts change-id I27069b20f7c7068b931340f548b284ce1676466c.

This also reverts the identified change for the memory regression in
b/140648539.

Test: Build & boot on taimen_hwasan-userdebug
Test: Build & boot on crosshatch_hwasan-userdebug
Bug: 140790209
Bug: 139408016
Bug: 140648539
Change-Id: Ib61c53571a4de0970a86ebc391a2ce780247943a
This commit is contained in:
Martin Stjernholm 2019-09-17 20:06:54 +00:00
parent b0321c1de1
commit 59b54f42bb
3 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,16 +80,14 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace exposes externally accessible libraries from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
namespace.runtime.isolated = true
# Visible to allow links to be created at runtime, e.g. through
# 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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.links = default
# Need allow_all_shared_libs because libart.so can dlopen oat files in
# /system/framework and /data.

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

@ -161,16 +161,14 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace exposes externally accessible libraries from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
namespace.runtime.isolated = true
# Visible to allow links to be created at runtime, e.g. through
# 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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.links = default
# Need allow_all_shared_libs because libart.so can dlopen oat files in
# /system/framework and /data.
@ -490,13 +488,11 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace exposes externally accessible libraries from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${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.
@ -697,16 +693,14 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace exposes externally accessible libraries from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
namespace.runtime.isolated = true
# Visible to allow links to be created at runtime, e.g. through
# 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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${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.

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

@ -100,16 +100,14 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace pulls in externally accessible libs from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
namespace.runtime.isolated = true
# Visible to allow links to be created at runtime, e.g. through
# 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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.links = default
# Need allow_all_shared_libs because libart.so can dlopen oat files in
# /system/framework and /data.
@ -420,13 +418,11 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace exposes externally accessible libraries from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${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.
@ -504,16 +500,14 @@ namespace.default.link.neuralnetworks.shared_libs = libneuralnetworks.so
# This namespace exposes externally accessible libraries from the Runtime APEX.
# Keep in sync with the "runtime" namespace in art/build/apex/ld.config.txt.
###############################################################################
# TODO(b/139408016): Rename this namespace to "art".
namespace.runtime.isolated = true
# Visible to allow links to be created at runtime, e.g. through
# 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.search.paths = /apex/com.android.art/${LIB}
namespace.runtime.asan.search.paths = /apex/com.android.art/${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.