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

Commit 59b54f42 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

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

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
parent b0321c1d

rootdir/etc/ld.config.legacy.txt

+3 −5
Original line number Diff line number Diff line
@@ -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.links = default

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

# /system/framework and /data.

rootdir/etc/ld.config.txt

+9 −15
Original line number Diff line number Diff line
@@ -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.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.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.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

+9 −15
Original line number Diff line number Diff line
@@ -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.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.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.links = default

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

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