diff options
| author | Richard Coles <torne@google.com> | 2014-10-20 09:00:57 +0000 |
|---|---|---|
| committer | Richard Coles <torne@google.com> | 2014-10-20 09:00:57 +0000 |
| commit | 2c02f90de2bab08007a2eb10b28e9e04e0795493 (patch) | |
| tree | 235f1b99151b53c6740feed9ab598bd113f155f1 | |
| parent | f6e8110f5634f4fe4d256f1e3144a764ead1d8fa (diff) | |
| download | chromium-libpac-2c02f90de2bab08007a2eb10b28e9e04e0795493.tar.gz | |
Revert "Revert "Statically link chromium's ICU.""
Chromium is using a statically linked ICU again.
This reverts commit f6e8110f5634f4fe4d256f1e3144a764ead1d8fa.
Change-Id: I1b5b5e18a678e7527215937c7499cf1d4eae022a
| -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 |