commit 455e499b1234132fa294c1ac755e97b646a88900
author Ben Cheng <bccheng@google.com> Wed Apr 16 17:09:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 16 17:09:06 2014 +0000
tree e5672c6c8aaaa0d62acd117bf94158975b836f2f
parent 25e75abac2c9229c0c4741e33f504a341a36ad94
parent 6350c21eaf50435471751808ad343b0143712bae

am 6350c21e: am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."

* commit '6350c21eaf50435471751808ad343b0143712bae':
  Explicitly link libstdc++.a for static gtest executables.

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index e531356..7b99678 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -12,6 +12,7 @@
                     bionic/libstdc++/include \
                     external/stlport/stlport
 LOCAL_SHARED_LIBRARIES += libstlport
+LOCAL_STATIC_LIBRARIES += libstdc++
 endif
 
 ifndef LOCAL_MODULE_PATH