commit 7a9f4c26902b012aec0aa7373a03feaffd2134d1
author Dan Bornstein <danfuzz@android.com> Wed May 05 17:51:53 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 05 17:51:53 2010 -0700
tree ca19a15bac15467dfda89572e654edbebdacb8a3
parent cc42a2d6f45ca74d64994908e8483c446b734036
parent 83b97a6a267a4ed9806191277289870156b2c372

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

Merge commit '83b97a6a267a4ed9806191277289870156b2c372' into kraken

* commit '83b97a6a267a4ed9806191277289870156b2c372':
  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)