am d6f31851: merge from open-source master

Merge commit 'd6f3185148933e4bae17e8f6efe7610cd1cf7769'

* commit 'd6f3185148933e4bae17e8f6efe7610cd1cf7769':
  Allow dlclose() to properly call static C++ destructors.
This commit is contained in:
The Android Open Source Project 2010-07-02 11:40:56 -07:00 committed by Android Git Automerger
commit 8a5705c7fa

View File

@ -504,6 +504,10 @@ libc_common_c_includes := \
$(LOCAL_PATH)/string \
$(LOCAL_PATH)/stdio
# Needed to access private/__dso_handle.S from
# crtbegin_xxx.S and crtend_xxx.S
#
libc_crt_target_cflags += -I$(LOCAL_PATH)/private
# Define the libc run-time (crt) support object files that must be built,
# which are needed to build all other objects (shared/static libs and