diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-21 18:34:03 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-21 20:10:02 -0700 |
| commit | a3a8f6d2ab16afaa3018406c694c7d63929f2a83 (patch) | |
| tree | 6be35d1c4e7855c6ef109502d62c16beaf47d385 | |
| parent | 5b7bb03ee84185bd83a594569264cc3841b80749 (diff) | |
| download | system_core-a3a8f6d2ab16afaa3018406c694c7d63929f2a83.zip system_core-a3a8f6d2ab16afaa3018406c694c7d63929f2a83.tar.gz system_core-a3a8f6d2ab16afaa3018406c694c7d63929f2a83.tar.bz2 | |
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
| -rw-r--r-- | libbacktrace/Android.build.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 |