commit 425ed96a38975c97c6e9959fc29c7ca7960cc08c
author Dan Albert <danalbert@google.com> Thu May 22 18:28:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 22 18:28:01 2014 +0000
tree 01ba34814c022b739a0a1530e4add274f621c2bf
parent 6963176fb2b0423a33f985b13843d3b32c6e8de7
parent 633a2e3b6a1d00257965a5772a5467a6df9911a5

am 633a2e3b: am 3ab1d61b: am 3b5cd911: Merge "Remove libstdc++ dependency from host libbacktrace"

* commit '633a2e3b6a1d00257965a5772a5467a6df9911a5':
  Remove libstdc++ dependency from host libbacktrace

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