commit dd24e27dd68adc52b2904e776ab5dd41895c224b
author David 'Digit' Turner <digit@google.com> Mon Jul 11 15:37:00 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 11 15:37:00 2011 -0700
tree 5ca4b3ca08c2ee8ac0afe65719859b1ce92ff71b
parent daf6f406bfb4654b0ad104a4ea623f515fcb0b6b
parent c67a10e6a443042414ddb3322de51b8ccdba8b21

am c67a10e6: resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp

* commit 'c67a10e6a443042414ddb3322de51b8ccdba8b21':
  Use the standard NDK,SDK versions so that we pick up the correct crt files
  Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.
  Don't use stale NDK libraries for IA

stlport/stl/config/_android.h

diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h
index 82a8907..7a8538a 100644
--- a/stlport/stl/config/_android.h
+++ b/stlport/stl/config/_android.h
@@ -87,4 +87,9 @@
 // Android does have include_next but it doesn't work well in our build system.
 #undef _STLP_HAS_INCLUDE_NEXT
 
+// Android X86 target uses GCC 4.2.1 which apparently has this problem
+#if defined(__i386__)
+#   define _STLP_CONST_CONSTRUCTOR_BUG 1
+#endif
+
 #endif /* __stl_config__android_h */