commit a3a8f6d2ab16afaa3018406c694c7d63929f2a83
author Dan Albert <danalbert@google.com> Wed May 21 18:34:03 2014 -0700
committer Dan Albert <danalbert@google.com> Wed May 21 20:10:02 2014 -0700
tree 6be35d1c4e7855c6ef109502d62c16beaf47d385
parent 5b7bb03ee84185bd83a594569264cc3841b80749

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.

Change-Id: I1d14fb9e18abd074affcf46c8044407041970669

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