summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-07-15 11:08:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-15 11:08:34 -0700
commit3a053db28451858162f3dd84f18fae2f245b07f1 (patch)
treee564352780c16183973895ed9e26a64242279550 /core/jni
parenteb6e0df18a6567d38caa039ba0b0e49e2e9b46c3 (diff)
parentaa1933ac4cb135be5469db275af7a758cdfdf744 (diff)
downloadframeworks_base-3a053db28451858162f3dd84f18fae2f245b07f1.zip
frameworks_base-3a053db28451858162f3dd84f18fae2f245b07f1.tar.gz
frameworks_base-3a053db28451858162f3dd84f18fae2f245b07f1.tar.bz2
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index a008e96..468f844 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -184,7 +184,6 @@ LOCAL_SHARED_LIBRARIES := \
libssl \
libicuuc \
libicui18n \
- libicudata \
libmedia \
libwpa_client \
libjpeg