From 60b259b93a9368c8f3a3992f884efa8b00ba24ca Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 31 Jan 2019 11:55:20 +0000 Subject: [PATCH] Make libnative*.so from the Runtime APEX libs accessible to vendor binaries. Test: Flash and boot Test: Boot test on internal tree Bug: 119840313 Change-Id: I7c87519f94af2eeef9ebfd0d1e46e7bfca8df5c5 --- rootdir/etc/ld.config.txt | 5 ++++- rootdir/etc/ld.config.vndk_lite.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index a61741871..d5052e424 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -466,7 +466,10 @@ namespace.system.asan.search.paths += /data/asan/product_services/${LIB} namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.system.links = runtime -namespace.system.link.runtime.shared_libs = libdexfile_external.so +namespace.system.link.runtime.shared_libs = libdexfile_external.so +namespace.system.link.runtime.shared_libs += libnativebridge.so +namespace.system.link.runtime.shared_libs += libnativehelper.so +namespace.system.link.runtime.shared_libs += libnativeloader.so ############################################################################### # Namespace config for binaries under /postinstall. diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index ae486eab5..78195f47f 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -333,7 +333,10 @@ namespace.default.asan.search.paths += /data/asan/product_services/${LIB} namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.links = runtime -namespace.default.link.runtime.shared_libs = libdexfile_external.so +namespace.default.link.runtime.shared_libs = libdexfile_external.so +namespace.default.link.runtime.shared_libs += libnativebridge.so +namespace.default.link.runtime.shared_libs += libnativehelper.so +namespace.default.link.runtime.shared_libs += libnativeloader.so ############################################################################### # "runtime" APEX namespace