summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-07-15 11:54:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-15 11:54:05 -0700
commita0c749e2dd16aa47c39c5dea7e3327cfa7895b00 (patch)
tree9856ade2852490c0ea8a1f7b09362e391a737b45 /Android.mk
parentff80790be406da04e7afbd8aea7bb0e26f1f08f0 (diff)
parent725338187e8e5e36ec3647b675caf1fcd8e5cab7 (diff)
downloadexternal_webkit-a0c749e2dd16aa47c39c5dea7e3327cfa7895b00.zip
external_webkit-a0c749e2dd16aa47c39c5dea7e3327cfa7895b00.tar.gz
external_webkit-a0c749e2dd16aa47c39c5dea7e3327cfa7895b00.tar.bz2
am 72533818: am 4da2dabd: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '725338187e8e5e36ec3647b675caf1fcd8e5cab7' * commit '725338187e8e5e36ec3647b675caf1fcd8e5cab7': The ICU data is no longer compiled directly into the shared library.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a86fffa..1d45706 100644
--- a/Android.mk
+++ b/Android.mk
@@ -310,7 +310,6 @@ LOCAL_SHARED_LIBRARIES := \
libui \
libcutils \
libicuuc \
- libicudata \
libicui18n \
libmedia \
libsurfaceflinger_client