diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-09-02 15:59:26 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-09-03 15:37:58 +0100 |
| commit | a6faf752248131bb0b463d02eb3ba3bb7a7bc5bd (patch) | |
| tree | 235f1b99151b53c6740feed9ab598bd113f155f1 | |
| parent | 2780f4b2015692837abedbd56b753ef25e95c6e0 (diff) | |
| download | chromium-libpac-a6faf752248131bb0b463d02eb3ba3bb7a7bc5bd.tar.gz | |
Statically link chromium's ICU.
Chromium will no longer use the system ICU and is now statically linking
the Chromium copy instead. This is a different version to the system
ICU, so Chromium's V8 can't link to the system ICU any more due to
different symbol names. Statically link Chromium's ICU instead. This
increases binary size by ~7MB.
Bug: 17370214
Change-Id: Ib5a70b849a635e5703f4b64ab685bb2cebaab910
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -26,9 +26,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 libstlport liblog libicui18n libicuuc +LOCAL_SHARED_LIBRARIES := libutils libstlport liblog libgabi++ include external/stlport/libstlport.mk |