summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2010-05-05 17:52:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-05 17:52:04 -0700
commit27bb904e35a755c541302d014f2b3ddaa3dfb7cb (patch)
tree4660610ecefddaf54225a469a5ae0387372b1cf2
parent44577d1f0e8d8ea13fe130fc8987035428ee021c (diff)
parent2c4ce96e814bbde60dba2a33df3a06dcf3734ca6 (diff)
downloadomap3-27bb904e35a755c541302d014f2b3ddaa3dfb7cb.tar.gz
am 2c4ce96e: am 801f558c: For issue #2651381, allow library prelinking.
Merge commit '2c4ce96e814bbde60dba2a33df3a06dcf3734ca6' into kraken * commit '2c4ce96e814bbde60dba2a33df3a06dcf3734ca6': For issue #2651381, allow library prelinking.
-rw-r--r--libstagefrighthw/Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 620c4f0..8d2b73b 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -22,7 +22,5 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libstagefrighthw
-LOCAL_PRELINK_MODULE:= false
-
include $(BUILD_SHARED_LIBRARY)