commit 8a5705c7fa76e8a23c2dcdcd7a4d20aae44f1b3c
author The Android Open Source Project <initial-contribution@android.com> Fri Jul 02 11:40:56 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 02 11:40:56 2010 -0700
tree 7e0e180cfd795d468310d16257405f42574ae7d3
parent 4e6043a355ccc04b3e931edd7616d35ef5691278
parent d6f3185148933e4bae17e8f6efe7610cd1cf7769

am d6f31851: merge from open-source master

Merge commit 'd6f3185148933e4bae17e8f6efe7610cd1cf7769'

* commit 'd6f3185148933e4bae17e8f6efe7610cd1cf7769':
  Allow dlclose() to properly call static C++ destructors.

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index bc5115f..c5f42b7 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -504,6 +504,10 @@
 		$(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