From ff67ef3c7d03f2b40daa86a17d6ba33168492880 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Tue, 19 Feb 2019 21:32:07 +0000 Subject: [PATCH] Expose libandroidicu to llndk namespace Bug: 124772622 Test: Treehugger Change-Id: If936eb377c7f0994a9225b8099a672addb2f9ed6 --- rootdir/etc/ld.config.txt | 3 ++- rootdir/etc/ld.config.vndk_lite.txt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 44b7035bf..cdfcfe118 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -485,7 +485,8 @@ 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 - +# Workaround for b/124772622 +namespace.system.link.runtime.shared_libs += libandroidicu.so ############################################################################### # Namespace config for native tests that need access to both system and vendor diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 92f287c25..59fd568f1 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -344,6 +344,8 @@ 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 +# Workaround for b/124772622 +namespace.default.link.runtime.shared_libs += libandroidicu.so ############################################################################### # "runtime" APEX namespace