diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-27 16:18:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-27 16:18:38 +0000 |
| commit | 196d0e92ba618530a7c048ede117243d09d64ceb (patch) | |
| tree | 5980d3790187c3c0dd7936abc65ccd0aef2f9fbb | |
| parent | 10ad12a16d1e0ab6182e254bf15fd567ea26c8ac (diff) | |
| parent | 62aae4ff9dddea450190ecba9e1fee0eb35719f0 (diff) | |
| download | chromium-libpac-196d0e92ba618530a7c048ede117243d09d64ceb.tar.gz | |
Merge "Statically link chromium's ICU."
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -27,9 +27,12 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/src \ # DO NOT COPY without permission from WebView Owners LOCAL_STATIC_LIBRARIES := v8_tools_gyp_v8_base_gyp \ v8_tools_gyp_v8_libbase_gyp \ - v8_tools_gyp_v8_snapshot_gyp + v8_tools_gyp_v8_snapshot_gyp \ + third_party_icu_icui18n_gyp \ + third_party_icu_icuuc_gyp \ + third_party_icu_icudata_gyp -LOCAL_SHARED_LIBRARIES := libutils liblog libicui18n libicuuc +LOCAL_SHARED_LIBRARIES := libutils liblog libgabi++ include external/stlport/libstlport.mk |