am 90e83bcc: merge from open-source master

Merge commit '90e83bcc1c41a4d6d310b2bd5cb747a53a88fff3'

* commit '90e83bcc1c41a4d6d310b2bd5cb747a53a88fff3':
  Fix undefined reference to dl_iterate_phdr for x86
This commit is contained in:
The Android Open Source Project 2010-07-16 13:04:30 -07:00 committed by Android Git Automerger
commit be96be7e83

View File

@ -685,6 +685,7 @@ LOCAL_MODULE:= libc_malloc_debug_leak
LOCAL_SHARED_LIBRARIES := libc
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES :=
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't prelink
LOCAL_PRELINK_MODULE := false
# Don't install on release build