aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Coles <torne@google.com>2014-09-18 16:20:15 +0000
committerRichard Coles <torne@google.com>2014-09-18 16:20:15 +0000
commitf6e8110f5634f4fe4d256f1e3144a764ead1d8fa (patch)
tree56e6b7dfa187acb257b1fe942b516d60f46d6e60
parenta6faf752248131bb0b463d02eb3ba3bb7a7bc5bd (diff)
downloadchromium-libpac-f6e8110f5634f4fe4d256f1e3144a764ead1d8fa.tar.gz
Revert "Statically link chromium's ICU."
Chromium has (for now) switched back to the system ICU. This reverts commit a6faf752248131bb0b463d02eb3ba3bb7a7bc5bd. Change-Id: I2acd58231d9ad70bc5f2b13f55e9e8199ec35375
-rw-r--r--Android.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index cd27b31..4af69ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,12 +26,9 @@ 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 \
- third_party_icu_icui18n_gyp \
- third_party_icu_icuuc_gyp \
- third_party_icu_icudata_gyp
+ v8_tools_gyp_v8_snapshot_gyp
-LOCAL_SHARED_LIBRARIES := libutils libstlport liblog libgabi++
+LOCAL_SHARED_LIBRARIES := libutils libstlport liblog libicui18n libicuuc
include external/stlport/libstlport.mk