From 1d89a7e899e4135722b878684e557dfc1b93fe47 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 15 Aug 2019 09:48:07 +0900 Subject: [PATCH] neuralnetworks namespace links to system namespace in [vendor] section This change fixes a bug that neuralnetworks namespace is linked to the default namespace in [vendor] section. Default namespace is for /vendor/lib in [vendor] section. System libraries are available in the 'system' namespace. Bug: 139113342 Test: N/A Change-Id: I1b6751e5e33522f9829f3d9ad7371efdce01b0f0 --- rootdir/etc/ld.config.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 46e992030..a639592a1 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -633,15 +633,15 @@ namespace.neuralnetworks.visible = true namespace.neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.neuralnetworks.asan.search.paths = /apex/com.android.neuralnetworks/${LIB} -namespace.neuralnetworks.links = default -namespace.neuralnetworks.link.default.shared_libs = libc.so -namespace.neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.neuralnetworks.link.default.shared_libs += libdl.so -namespace.neuralnetworks.link.default.shared_libs += liblog.so -namespace.neuralnetworks.link.default.shared_libs += libm.so -namespace.neuralnetworks.link.default.shared_libs += libnativewindow.so -namespace.neuralnetworks.link.default.shared_libs += libsync.so -namespace.neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.neuralnetworks.links = system +namespace.neuralnetworks.link.system.shared_libs = libc.so +namespace.neuralnetworks.link.system.shared_libs += libcgrouprc.so +namespace.neuralnetworks.link.system.shared_libs += libdl.so +namespace.neuralnetworks.link.system.shared_libs += liblog.so +namespace.neuralnetworks.link.system.shared_libs += libm.so +namespace.neuralnetworks.link.system.shared_libs += libnativewindow.so +namespace.neuralnetworks.link.system.shared_libs += libsync.so +namespace.neuralnetworks.link.system.shared_libs += libvndksupport.so ############################################################################### # Namespace config for native tests that need access to both system and vendor