summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-07-15 11:13:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-15 11:13:02 -0700
commit725338187e8e5e36ec3647b675caf1fcd8e5cab7 (patch)
tree497257e8a1243a80d1d1ed4c128fbedd46d661f5
parentb47b5d4ad21fc9f19fc8e6c0f453032658cad4cf (diff)
parent4da2dabd9828e43b05c234be082905c7825a22ec (diff)
downloadexternal_webkit-725338187e8e5e36ec3647b675caf1fcd8e5cab7.zip
external_webkit-725338187e8e5e36ec3647b675caf1fcd8e5cab7.tar.gz
external_webkit-725338187e8e5e36ec3647b675caf1fcd8e5cab7.tar.bz2
am 4da2dabd: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '4da2dabd9828e43b05c234be082905c7825a22ec' into gingerbread-plus-aosp * commit '4da2dabd9828e43b05c234be082905c7825a22ec': The ICU data is no longer compiled directly into the shared library.
-rw-r--r--Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 4390cf3..21f6cf4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -278,7 +278,6 @@ LOCAL_SHARED_LIBRARIES := \
libui \
libcutils \
libicuuc \
- libicudata \
libicui18n \
libmedia \
libsurfaceflinger_client