aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-06-24 09:00:15 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-24 09:00:15 -0700
commit2e25a1fe3c2be14e07c8cffce7d408e61014a57d (patch)
treeb640e267e012edad57653de6f16797a03b9f3bb3
parent9d076a5b2421c911b6ea377187df3a9b0d80eb32 (diff)
parent18749cd7ca092ec364714e468892ecca208464a6 (diff)
downloadsfntly-2e25a1fe3c2be14e07c8cffce7d408e61014a57d.tar.gz
Merge "Switch host variant to using ICU direct" am: 914fafd798 am: 3403333ae2
am: 18749cd7ca Change-Id: I9d3cb970912506a372463808069c27b5f7d8329c
-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"],