summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-04-29 02:02:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-29 02:02:36 +0000
commitc99d1316941e90b384c778c324d5ea2742917ec4 (patch)
tree7d72e72739f6904b87b5b1826067655901e5b8a6
parentb75e58e2cecb17b184034936c40fa4b7264dc066 (diff)
parent285d67f35f6044cf733091e36248405ca967c62c (diff)
downloadlibcxxabi-c99d1316941e90b384c778c324d5ea2742917ec4.tar.gz
am 285d67f3: Don\'t build libcxx_abi for unbundled projects.
* commit '285d67f35f6044cf733091e36248405ca967c62c': Don't build libcxx_abi for unbundled projects.
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 15e3d11..2c86fb3 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))
+
# libcxxabi isn't working on mips yet
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH), mips mips64))
LOCAL_PATH := $(call my-dir)
@@ -96,3 +99,5 @@ LOCAL_LDFLAGS := -lpthread
LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG)
include $(BUILD_HOST_SHARED_LIBRARY)
endif
+
+endif # TARGET_BUILD_APPS