aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2020-10-14 16:51:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-14 16:51:47 +0000
commit652f5c561e7b1e64546a251a51258bb80a97c80f (patch)
tree799e15b8d4a8c93f55b522343665b2e15f3cbda3
parent8010ac24037bf5f06f858362c36e686b9ccf2017 (diff)
parent5648df2b38c4542afddf25921774f1cbdd5d3047 (diff)
downloadpdfium-652f5c561e7b1e64546a251a51258bb80a97c80f.tar.gz
Use the new shim libicu available for NDK am: a907511d26 am: d08fa93a5a am: 5648df2b38
Original change: https://android-review.googlesource.com/c/platform/external/pdfium/+/1454890 Change-Id: Icc76edd5e9ea9361d97d25160129543d6a1c5993
-rw-r--r--Android.bp2
-rw-r--r--core/fxcrt/Android.bp4
2 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 10a2cc359..ed6396aa1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,9 +96,9 @@ cc_library_shared {
// TODO: figure out why turning on exceptions requires manually linking libdl
shared_libs: [
- "libandroidicu",
"libdl",
"libft2",
+ "libicu",
"libjpeg",
"libz",
],
diff --git a/core/fxcrt/Android.bp b/core/fxcrt/Android.bp
index d48b2848c..520765614 100644
--- a/core/fxcrt/Android.bp
+++ b/core/fxcrt/Android.bp
@@ -5,7 +5,7 @@ cc_library_static {
visibility: ["//external/pdfium:__subpackages__"],
export_shared_lib_headers: [
- "libandroidicu",
+ "libicu",
],
static_libs: [
@@ -13,7 +13,7 @@ cc_library_static {
],
shared_libs: [
- "libandroidicu",
+ "libicu",
],
exclude_srcs: [