Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit d8bc220

Browse files
gvictorgrendello
authored andcommitted
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 Merged-In: Iab88307452d9467ddebc0d4dfc5a4799ff54324f Change-Id: Iab88307452d9467ddebc0d4dfc5a4799ff54324f (cherry picked from commit 57caede)
1 parent 138c272 commit d8bc220

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

android/Android.bp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ cc_library_static {
1717
include_dirs: ["external/sqlite/dist"],
1818
shared_libs: [
1919
"liblog",
20-
"libicuuc",
21-
"libicui18n",
20+
"libandroidicu",
2221
],
2322
target: {
2423
vendor: {
2524
cflags: ["-USQLITE_ENABLE_ICU"],
26-
exclude_shared_libs: ["libicuuc", "libicui18n"],
25+
exclude_shared_libs: ["libandroidicu"],
2726
},
2827
},
2928
export_include_dirs: ["."],

dist/Android.bp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ cc_library {
8080
"libdl",
8181
"liblog",
8282
"libutils",
83-
"libicuuc",
84-
"libicui18n",
83+
"libandroidicu",
8584
],
8685
cflags: ["-DSQLITE_ENABLE_ICU"],
8786

@@ -96,8 +95,7 @@ cc_library {
9695
},
9796
not_windows: {
9897
shared_libs: [
99-
"libicuuc",
100-
"libicui18n",
98+
"libandroidicu",
10199
],
102100

103101
// include android specific methods
@@ -108,7 +106,7 @@ cc_library {
108106
},
109107
vendor: {
110108
cflags: ["-USQLITE_ENABLE_ICU"],
111-
exclude_shared_libs: ["libicuuc", "libicui18n"],
109+
exclude_shared_libs: ["libandroidicu"],
112110
},
113111
},
114112

@@ -131,8 +129,7 @@ cc_binary {
131129
android: {
132130
shared_libs: [
133131
"libsqlite",
134-
"libicuuc",
135-
"libicui18n",
132+
"libandroidicu",
136133
"liblog",
137134
"libutils",
138135
],

0 commit comments

Comments
 (0)