commit 9cae50b38d6a58efe0799ef3697f594cb4b100f9
author Elliott Hughes <enh@google.com> Mon May 19 23:18:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 19 23:18:49 2014 +0000
tree 82e97b7f23f9e9d2385f6522f48bb4769404aee1
parent 201bf6769fec1bb01446d25e6efad0bf10c39296
parent aecc6a6657746afc9b95a960eedad10484bf14ac

Merge "Bound the ADB connect time with a non-blocking connect"

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 76c7106..dc73f9f 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -60,7 +60,7 @@
     $($(module)_ldlibs_$(build_type)) \
 
 ifeq ($(build_type),target)
-  ifneq ($(module)_libc++,)
+  ifneq ($($(module)_libc++),)
     include external/libcxx/libcxx.mk
   else
     include external/stlport/libstlport.mk

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.