summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2018-11-20 19:23:35 +0000
committerVictor Chang <vichang@google.com>2019-01-04 17:56:55 +0000
commit57caede3b8ab913890639390dbc3ee9af6c1726f (patch)
tree8c2655eaf4353de5a41310a0051ac37706a46986 /android
parent655aede6d8b601596d93c19e020170c685507123 (diff)
Use ICU in libandroidicu
libicuuc and libicui18n are moved into APEX, but they have no stable ABI due to the version suffix. Use libandroidicu which provides stable symbol. See http://go/apex-stable-icu4c-interface for the design. Bug: 117094880 Test: m checkbuild Change-Id: Iab88307452d9467ddebc0d4dfc5a4799ff54324f
Diffstat (limited to 'android')
-rw-r--r--android/Android.bp5
1 files changed, 2 insertions, 3 deletions
diff --git a/android/Android.bp b/android/Android.bp
index 9173a03..849ce70 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -17,13 +17,12 @@ cc_library_static {
include_dirs: ["external/sqlite/dist"],
shared_libs: [
"liblog",
- "libicuuc",
- "libicui18n",
+ "libandroidicu",
],
target: {
vendor: {
cflags: ["-USQLITE_ENABLE_ICU"],
- exclude_shared_libs: ["libicuuc", "libicui18n"],
+ exclude_shared_libs: ["libandroidicu"],
},
},
export_include_dirs: ["."],