summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-05-19 11:40:27 -0700
committerDan Albert <danalbert@google.com>2014-05-19 11:40:27 -0700
commita8b846022063a98ca623f5c67916dc6cb3fd2ad6 (patch)
treed3d865c806e0cedcee7d912dfec2e2f521c22307
parentf03bd9537b77f996cddd562d88558151d3d6c7fd (diff)
downloadsystem_core-a8b846022063a98ca623f5c67916dc6cb3fd2ad6.zip
system_core-a8b846022063a98ca623f5c67916dc6cb3fd2ad6.tar.gz
system_core-a8b846022063a98ca623f5c67916dc6cb3fd2ad6.tar.bz2
Fix unbundled branches
Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
-rwxr-xr-xlibbacktrace/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 13898ec..5a0bc7f 100755
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -72,6 +72,8 @@ include $(LOCAL_PATH)/Android.build.mk
build_type := host
include $(LOCAL_PATH)/Android.build.mk
+# Don't build for unbundled branches
+ifeq (,$(TARGET_BUILD_APPS))
#-------------------------------------------------------------------------
# The libbacktrace library (libc++)
#-------------------------------------------------------------------------
@@ -112,6 +114,7 @@ build_target := SHARED_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
build_type := host
include $(LOCAL_PATH)/Android.build.mk
+endif
#-------------------------------------------------------------------------
# The libbacktrace_test library needed by backtrace_test.