diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-29 17:46:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 17:46:54 +0000 |
| commit | e29e1b668d5691ffdffd9e7fb1fb787cd6d758cd (patch) | |
| tree | 5980d3790187c3c0dd7936abc65ccd0aef2f9fbb | |
| parent | 3d66f12460cad35b19708356fe4d3a8d4d83cb08 (diff) | |
| parent | 35152756c6acf9f7af4deed494afb0990b6087cd (diff) | |
| download | chromium-libpac-e29e1b668d5691ffdffd9e7fb1fb787cd6d758cd.tar.gz | |
am 35152756: am 196d0e92: Merge "Statically link chromium\'s ICU."
* commit '35152756c6acf9f7af4deed494afb0990b6087cd':
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 |