diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 04:50:13 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-27 04:50:13 -0700 |
| commit | 67880624cc323bd4b2443d473fedc99327b97b29 (patch) | |
| tree | d7d26605e1471541993b9e602f1910a21a3d50d1 /core/jni/Android.mk | |
| parent | c563beac062f433fc93b9a68c28df926f4c3d2f9 (diff) | |
| parent | c0139711b0e4a07ad997fb4130c674ed2d90e2fc (diff) | |
| download | frameworks_base-67880624cc323bd4b2443d473fedc99327b97b29.zip frameworks_base-67880624cc323bd4b2443d473fedc99327b97b29.tar.gz frameworks_base-67880624cc323bd4b2443d473fedc99327b97b29.tar.bz2 | |
am c0139711: Merge change 2432 into donut
Merge commit 'c0139711b0e4a07ad997fb4130c674ed2d90e2fc'
* commit 'c0139711b0e4a07ad997fb4130c674ed2d90e2fc':
Make android_runtime to not include libemoji but use dlopen() instead.
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 8d7335b..31cc4f7 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -164,8 +164,7 @@ LOCAL_SHARED_LIBRARIES := \ libicui18n \ libicudata \ libmedia \ - libwpa_client \ - libemoji + libwpa_client ifeq ($(BOARD_HAVE_BLUETOOTH),true) LOCAL_C_INCLUDES += \ |