summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Victor Chang <vichang@google.com> 2019-05-13 16:22:16 +0100
committer vichang <vichang@google.com> 2019-05-20 09:49:21 +0000
commitf03b151a9b86bc47f501ec7ea0b71d0598e90d52 (patch)
treeb0213bc287023d10e6f154843e55bd7e2ba88f3f
parent4a17f8af138aaebd9eab43cafe9639eee5179f47 (diff)
Allow linking to libicuuc.so and libicui18n.so from executable in /data
Executable in /data/ runs in default linker namespace, not classloader namespace. In Q, we moved libicuuc.so and libicui18n into the runtime namespace, and allow linking from runtime namespace and classloader namespace. This change further allows linking from default namespace, and tries to fix the regression temporarily. Bug: 130788466 Test: The app issue is fixed after this CL Change-Id: I3e392cf5a0573e4d303fa187eda4f0bf6cd49c6c
-rw-r--r--build/apex/ld.config.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt
index 12e4969266..f74132b06d 100644
--- a/build/apex/ld.config.txt
+++ b/build/apex/ld.config.txt
@@ -68,6 +68,9 @@ namespace.platform.links = runtime
namespace.platform.link.runtime.shared_libs = libandroidicu.so
namespace.platform.link.runtime.shared_libs += libdexfile_external.so
namespace.platform.link.runtime.shared_libs += libdexfiled_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.platform.link.runtime.shared_libs += libicui18n.so
+namespace.platform.link.runtime.shared_libs += libicuuc.so
namespace.platform.link.runtime.shared_libs += libnativebridge.so
namespace.platform.link.runtime.shared_libs += libnativehelper.so
namespace.platform.link.runtime.shared_libs += libnativeloader.so