From a3a8f6d2ab16afaa3018406c694c7d63929f2a83 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 21 May 2014 18:34:03 -0700 Subject: 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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libbacktrace') 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 @@ endif 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 -- cgit v1.1