diff options
author | Neil Fuller <nfuller@google.com> | 2019-06-24 09:29:44 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:29:44 -0700 |
commit | 29f2c4d11e465ea6af9d09c452136a7600aadd28 (patch) | |
tree | b640e267e012edad57653de6f16797a03b9f3bb3 | |
parent | 58b5356e78c579923afa972ab12d2c39792f167d (diff) | |
parent | 2e25a1fe3c2be14e07c8cffce7d408e61014a57d (diff) | |
download | sfntly-29f2c4d11e465ea6af9d09c452136a7600aadd28.tar.gz |
Merge "Switch host variant to using ICU direct" am: 914fafd798 am: 3403333ae2 am: 18749cd7ca
am: 2e25a1fe3c
Change-Id: I2caaafdeb59769ec9334a5e055fc400a682f81e5
-rw-r--r-- | Android.bp | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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"], |