aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-05-07 20:36:44 +0100
committerNeil Fuller <nfuller@google.com>2019-06-21 16:42:35 +0100
commit875956a6c4673188f503d68cd5fad8251984a5de (patch)
treec292937fe4a8f15b8dd7e3ae1c5cf695c6cb3d8a
parentbacf2d545c393a7bab829d0df2ccda7263b220ac (diff)
downloadsfntly-875956a6c4673188f503d68cd5fad8251984a5de.tar.gz
Switch host variant to using ICU direct
Switch host library variants to using ICU direct; libandroidicu should only be used on device. Bug: 130787951 Test: build only Change-Id: I6abd00fbe8c8380a8df597107d6028eff82d58da
-rw-r--r--Android.bp11
1 files changed, 7 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 1354a5a..7771723 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,10 +10,6 @@ cc_library_static {
"cpp/src/sample/chromium/subsetter_impl.cc",
],
- shared_libs: [
- "libandroidicu",
- ],
-
cflags: [
"-fstack-protector",
"--param=ssp-buffer-size=4",
@@ -94,6 +90,13 @@ cc_library_static {
target: {
android: {
cflags: ["-fPIC"],
+ shared_libs: ["libandroidicu"],
+ },
+ host: {
+ shared_libs: [
+ "libicui18n",
+ "libicuuc"
+ ],
},
not_windows: {
cflags: ["-fPIC"],