diff options
| author | Joe Onorato <joeo@android.com> | 2010-07-15 11:53:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:53:51 -0700 |
| commit | 0dff8d4afdc1b1ab545196dc21c2bf524f91ef88 (patch) | |
| tree | 943985474348081a5479bcbcbdc39bd76c89e4e1 /core/jni/Android.mk | |
| parent | ce38d0c2e5bab454d9cb9f9ab6e99483b4754c87 (diff) | |
| parent | a6be4e01b23610cbcc27c6f26cfa390beabfa1fe (diff) | |
| download | frameworks_base-0dff8d4afdc1b1ab545196dc21c2bf524f91ef88.zip frameworks_base-0dff8d4afdc1b1ab545196dc21c2bf524f91ef88.tar.gz frameworks_base-0dff8d4afdc1b1ab545196dc21c2bf524f91ef88.tar.bz2 | |
am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'
* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
The ICU data is no longer compiled directly into the shared library.
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index d19cae4..d61d56e 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -188,7 +188,6 @@ LOCAL_SHARED_LIBRARIES := \ libssl \ libicuuc \ libicui18n \ - libicudata \ libmedia \ libwpa_client \ libjpeg |