commit 35152756c6acf9f7af4deed494afb0990b6087cd
author Torne (Richard Coles) <torne@google.com> Tue Oct 28 19:28:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 28 19:28:31 2014 +0000
tree 5980d3790187c3c0dd7936abc65ccd0aef2f9fbb
parent 6db11f2d9323637975dcdefa1fcfe10c0cbbe38b
parent 196d0e92ba618530a7c048ede117243d09d64ceb

am 196d0e92: Merge "Statically link chromium\'s ICU."

* commit '196d0e92ba618530a7c048ede117243d09d64ceb':
  Statically link chromium's ICU.

Android.mk

diff --git a/Android.mk b/Android.mk
index 1946367..29c85e5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,9 +27,12 @@
 # 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