diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-05-05 17:50:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 17:50:12 -0700 |
| commit | 6b7954e2967754a77c55dc4291941978e3508259 (patch) | |
| tree | 16911876b865885da60712fb0bd2c11a963a1efc | |
| parent | c04d7b727e3d1ee8cdeef5e2a634ce2d2df1e9ab (diff) | |
| parent | 4ee507f260bb4cfa02c59bc2d0d39b1724947ff9 (diff) | |
| download | PinyinIME-6b7954e2967754a77c55dc4291941978e3508259.tar.gz | |
am 4ee507f2: For issue #2651381, allow library prelinking.android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbread
Merge commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9' into froyo-plus-aosp
* commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9':
For issue #2651381, allow library prelinking.
| -rw-r--r-- | jni/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 141a0b7..775a620 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -26,7 +26,6 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) LOCAL_LDLIBS += -lpthread LOCAL_MODULE := libjni_pinyinime -LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libcutils libutils include $(BUILD_SHARED_LIBRARY) |