commit 2d3742e38b9ba9f364776b7c7c9bf00472754237
author Kevin Chyn <kchyn@google.com> Tue Feb 19 22:48:59 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 19 22:48:59 2019 -0800
tree 63474dea2462a344cc0231af57501ff1145ba637
parent 89e26b9c0cec85aa7e5546e3bc9babe4e7f06d2e
parent 673b9398f6a00a12acf56b09bbdc091bb235951b

Merge "Expose libandroidicu to llndk namespace"
am: 4275d9b887

Change-Id: I923c452c153d0b855885ac6a286921c63418feab

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 44b7035..cdfcfe1 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -485,7 +485,8 @@
 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

rootdir/etc/ld.config.vndk_lite.txt

diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index 92f287c..59fd568 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 += 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