commit 6b7954e2967754a77c55dc4291941978e3508259
author Dan Bornstein <danfuzz@android.com> Wed May 05 17:50:12 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 05 17:50:12 2010 -0700
tree 16911876b865885da60712fb0bd2c11a963a1efc
parent c04d7b727e3d1ee8cdeef5e2a634ce2d2df1e9ab
parent 4ee507f260bb4cfa02c59bc2d0d39b1724947ff9

am 4ee507f2: For issue #2651381, allow library prelinking.

Merge commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9' into froyo-plus-aosp

* commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9':
  For issue #2651381, allow library prelinking.

jni/Android.mk

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_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)