commit 83b97a6a267a4ed9806191277289870156b2c372
author Dan Bornstein <danfuzz@android.com> Wed May 05 17:50:07 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 05 17:50:07 2010 -0700
tree bd66e05418dd6462972ce59e3a7d82a56b8feac4
parent 44bce0fb572b0513025e4cfd4bf2c58f5ddef2b3
parent 458f06335a73438865bf633aeff399cbaedb71e1

am 458f0633: For issue #2651381, allow library prelinking.

Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into froyo-plus-aosp

* commit '458f06335a73438865bf633aeff399cbaedb71e1':
  For issue #2651381, allow library prelinking.

libdiskconfig/Android.mk

diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk
index f264103..1d0ecb4 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -12,7 +12,6 @@
 	config_mbr.c
 
 LOCAL_MODULE := libdiskconfig
-LOCAL_PRELINK_MODULE := false
 LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
 
 include $(BUILD_SHARED_LIBRARY)