summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-11 19:58:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-10 22:20:24 +0000
commita9aa0f2c42e2291496f39ca60775ff95648eba31 (patch)
tree38a3cb884705c5dc3e6bbf3bf1ebccb652fa472c
parentf2521e76ffd5baaf13f7ddf16bcc0ef58959cfae (diff)
parentdeebae596be0dcf7e66f57d9a3c1bf65406c1992 (diff)
downloadsystem_core-a9aa0f2c42e2291496f39ca60775ff95648eba31.zip
system_core-a9aa0f2c42e2291496f39ca60775ff95648eba31.tar.gz
system_core-a9aa0f2c42e2291496f39ca60775ff95648eba31.tar.bz2
Merge "Build the libc++ variant of libbacktrace on the host for Mac."
-rwxr-xr-xlibbacktrace/Android.mk17
1 files changed, 17 insertions, 0 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 5a0bc7f..74bae1a 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -186,4 +186,21 @@ LOCAL_SRC_FILES := \
include $(BUILD_HOST_SHARED_LIBRARY)
+# Don't build for unbundled branches
+ifeq (,$(TARGET_BUILD_APPS))
+#-------------------------------------------------------------------------
+# The libbacktrace library (libc++)
+#-------------------------------------------------------------------------
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libbacktrace_libc++
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+ BacktraceMap.cpp \
+
+include $(BUILD_HOST_SHARED_LIBRARY)
+
+endif # TARGET_BUILD_APPS
+
endif # HOST_OS-darwin