From a8b846022063a98ca623f5c67916dc6cb3fd2ad6 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Mon, 19 May 2014 11:40:27 -0700
Subject: [PATCH] Fix unbundled branches

Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
---
 libbacktrace/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 13898ec44..5a0bc7ff6 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.