commit 3ab1d61b75239515cbb3086a9991650301048cd3
author Dan Albert <danalbert@google.com> Thu May 22 17:27:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 22 17:27:05 2014 +0000
tree 23822184a78c79b639a745ca48e1e6f61edd99b7
parent 337f94f1eb6d65e37689e78d9d33ae0a33ce6607
parent 3b5cd9117df7e7420055352b496383a477f008d3

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

* commit '3b5cd9117df7e7420055352b496383a477f008d3':
  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