commit b495400451d53a2d6a57fb1d23315d719d82f802
author Dan Albert <danalbert@google.com> Wed May 21 18:34:03 2014 -0700
committer Brian Carlstrom <bdc@google.com> Mon Jun 09 15:05:02 2014 -0700
tree 4c7b4f4eea7ebf5d80b902cb032edae22b356d86
parent c24b98c7d8d9380f885bb6ea4055a34082353879

Remove libstdc++ dependency from host libbacktrace

The libc++ version of libbacktrace on the host was still linking against
libstdc++, and this was causing problems in art.

(cherry picked from commit a3a8f6d2ab16afaa3018406c694c7d63929f2a83)

Change-Id: Id511dd9cca05c3aa0de2ad13682675ea4ac6424d

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index dc73f9f..9882e31 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -72,6 +72,9 @@
 ifeq ($(build_type),host)
   # Only build if host builds are supported.
   ifeq ($(build_host),true)
+    ifneq ($($(module)_libc++),)
+      include external/libcxx/libcxx.mk
+    endif
     include $(BUILD_HOST_$(build_target))
   endif
 endif