commit 0623009b58c26fbf5ea22b4bdbf40d6f6a749d02
author Stephen Hines <srhines@google.com> Tue Apr 29 02:02:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 29 02:02:32 2014 +0000
tree c9ef44108bec00ec9e2018fecee25ca7b102e090
parent fe9e4c02951ca412c8958e5a0486f3a98834e3e5
parent 27ae7cb782821a4f2d3813522ee411cd978bcd85

am 27ae7cb7: Don\'t build libc++ for unbundled projects.

* commit '27ae7cb782821a4f2d3813522ee411cd978bcd85':
  Don't build libc++ for unbundled projects.

Android.mk

diff --git a/Android.mk b/Android.mk
index 67a5959..6805077 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Don't build for unbundled branches
+ifeq (,$(TARGET_BUILD_APPS))
+
 # libcxx isn't working on mips yet
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH), mips mips64))
 LOCAL_PATH := $(call my-dir)
@@ -87,3 +90,5 @@
 LOCAL_SHARED_LIBRARIES := libcxxabi
 include $(BUILD_HOST_SHARED_LIBRARY)
 endif
+
+endif  # TARGET_BUILD_APPS