commit 75949c699819af8941b4b1e7997a10c3ec5f72cf
author Dan Albert <danalbert@google.com> Fri May 16 16:40:16 2014 -0700
committer Dan Albert <danalbert@google.com> Fri May 16 16:40:16 2014 -0700
tree 1049dbd5aabb9216a4582970b128a6f4e336464e
parent 4a2fd7dccd9a81f539108bb77e514c89dfc7dc94

Don't build libc++ libs for ub branches

Change-Id: Ib73f6d38ed7d2bcb759a0f3e4ee44010b552fddc

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index e7f8ff7..e257d42 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -97,6 +97,8 @@
 
 include $(BUILD_STATIC_LIBRARY)
 
+# Don't build for unbundled branches
+ifeq (,$(TARGET_BUILD_APPS))
 #######################################################################
 # libc++
 
@@ -155,3 +157,4 @@
 
 include external/libcxx/libcxx.mk
 include $(BUILD_STATIC_LIBRARY)
+endif