diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 04:48:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-27 04:48:21 -0700 |
| commit | c0139711b0e4a07ad997fb4130c674ed2d90e2fc (patch) | |
| tree | e81e6ca2f318fc1b9fb0b6a81e83be078b464dc4 /core/jni/Android.mk | |
| parent | 298784cd8a7ed77923bdb51de38c15e4c246a037 (diff) | |
| parent | 63507babb6798d65bf965de6ea4622b7ec65aa28 (diff) | |
| download | frameworks_base-c0139711b0e4a07ad997fb4130c674ed2d90e2fc.zip frameworks_base-c0139711b0e4a07ad997fb4130c674ed2d90e2fc.tar.gz frameworks_base-c0139711b0e4a07ad997fb4130c674ed2d90e2fc.tar.bz2 | |
Merge change 2432 into donut
* changes:
Make android_runtime to not include libemoji but use dlopen() instead. This must be submitted with change 2432
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 d46dd80..ed8deb1 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -165,8 +165,7 @@ LOCAL_SHARED_LIBRARIES := \ libicui18n \ libicudata \ libmedia \ - libwpa_client \ - libemoji + libwpa_client ifeq ($(BOARD_HAVE_BLUETOOTH),true) LOCAL_C_INCLUDES += \ |