diff options
| author | Joe Onorato <joeo@android.com> | 2010-07-15 11:12:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:12:53 -0700 |
| commit | a6be4e01b23610cbcc27c6f26cfa390beabfa1fe (patch) | |
| tree | d583a7b854f0c4535b9f414402785266e879f99f /core/jni/Android.mk | |
| parent | d1313da5999e06be16e52527cfba443f66b333a1 (diff) | |
| parent | 3a053db28451858162f3dd84f18fae2f245b07f1 (diff) | |
| download | frameworks_base-a6be4e01b23610cbcc27c6f26cfa390beabfa1fe.zip frameworks_base-a6be4e01b23610cbcc27c6f26cfa390beabfa1fe.tar.gz frameworks_base-a6be4e01b23610cbcc27c6f26cfa390beabfa1fe.tar.bz2 | |
am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp
* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
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 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 |