From 8ec6f59e624802732b59139630e877a9e15b1b73 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 7 Oct 2019 09:30:51 +0900 Subject: [PATCH] Add a link from runtime ns to the neuralnetworks ns libneuralnetworks.so could be preloaded. In that case, it should be accessible from libnativeloader which runs in the runtime namespace. Bug: 141847343 Bug: 142111172 Test: m, marlin/sailfish boots Change-Id: I5b2f3073d0711d6049b4e1e1bd0bcc403949fe14 --- rootdir/etc/ld.config.vndk_lite.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index b9b95a66b..7c8b3e72f 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -108,12 +108,13 @@ namespace.runtime.visible = true namespace.runtime.search.paths = /apex/com.android.art/${LIB} namespace.runtime.asan.search.paths = /apex/com.android.art/${LIB} -namespace.runtime.links = default +namespace.runtime.links = default,neuralnetworks # Need allow_all_shared_libs because libart.so can dlopen oat files in # /system/framework and /data. # TODO(b/130340935): Use a dynamically created linker namespace similar to # classloader-namespace for oat files, and tighten this up. namespace.runtime.link.default.allow_all_shared_libs = true +namespace.runtime.link.neuralnetworks.shared_libs = libneuralnetworks.so ############################################################################### # "media" APEX namespace