summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader.cpp
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2016-02-02 10:40:08 -0800
committerDimitry Ivanov <dimitry@google.com>2016-02-02 11:06:31 -0800
commitc24ca894f541c78c661ad40ec9bcf78384f2b26d (patch)
treef6449d0302f639f20c25ca58208a4f771dca9df3 /libnativeloader/native_loader.cpp
parent650f6809a39d8116f8f13f527c65372b80070f5e (diff)
Include icu4c libraries to the list of public libs
Note that with this change the linker will ignore icu libraries provided by an app because public libraries are always provided by system. At this point it does not affect any apps because before Marshmallow all of them were getting platform version of icu4c libs anyways (they will be getting their own copy of the library only in Marshmallow release). Bug: http://b/26217329 Bug: http://b/26929349 Change-Id: I681cab43c9f28ec22319d9f0424bd3df00743a5f
Diffstat (limited to 'libnativeloader/native_loader.cpp')
-rw-r--r--libnativeloader/native_loader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 6e6b0b944..209ff1cc3 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -42,6 +42,8 @@ static const char* kPublicNativeLibraries = "libandroid.so:"
"libGLESv1_CM.so:"
"libGLESv2.so:"
"libGLESv3.so:"
+ "libicui18n.so:"
+ "libicuuc.so:"
"libjnigraphics.so:"
"liblog.so:"
"libmediandk.so:"