commit a8b846022063a98ca623f5c67916dc6cb3fd2ad6
author Dan Albert <danalbert@google.com> Mon May 19 11:40:27 2014 -0700
committer Dan Albert <danalbert@google.com> Mon May 19 11:40:27 2014 -0700
tree d3d865c806e0cedcee7d912dfec2e2f521c22307
parent f03bd9537b77f996cddd562d88558151d3d6c7fd

Fix unbundled branches

Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943

libbacktrace/Android.mk

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 @@
 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 @@
 include $(LOCAL_PATH)/Android.build.mk
 build_type := host
 include $(LOCAL_PATH)/Android.build.mk
+endif
 
 #-------------------------------------------------------------------------
 # The libbacktrace_test library needed by backtrace_test.