commit 1633fa9bfc80b20966995c52cd06b3023dcd3406
author Dan Bornstein <danfuzz@android.com> Wed May 05 17:50:10 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 05 17:50:10 2010 -0700
tree d32efc59d62d27928c40a77b538dc845827e1486
parent b1068051c775f395e2e3e75877be74fa62f2a8df
parent 3d23421c1171e5c04691c2e128c9fb86a4082dfa

am 3d23421c: Merge "For issue #2651381, allow library prelinking." into froyo

Merge commit '3d23421c1171e5c04691c2e128c9fb86a4082dfa' into froyo-plus-aosp

* commit '3d23421c1171e5c04691c2e128c9fb86a4082dfa':
  For issue #2651381, allow library prelinking.

native/Android.mk

diff --git a/native/Android.mk b/native/Android.mk
index 9ba9f75..12b6964 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -13,8 +13,6 @@
 
 LOCAL_LDLIBS := -lm
 
-LOCAL_PRELINK_MODULE := false
-
 LOCAL_SHARED_LIBRARIES := \
     libandroid_runtime \
     libcutils \