summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-04-25 19:13:50 -0700
committerStephen Hines <srhines@google.com>2014-04-25 19:13:50 -0700
commit285d67f35f6044cf733091e36248405ca967c62c (patch)
tree7d72e72739f6904b87b5b1826067655901e5b8a6
parent09437217701ee0d16962250b375698ceece839e8 (diff)
downloadlibcxxabi_35a-285d67f35f6044cf733091e36248405ca967c62c.tar.gz
Don't build libcxx_abi for unbundled projects.HEADmastermain
It is preinstalled from prebuilts/sdk instead. Change-Id: Ife0cec3a944fb3c4f7d77b4397decae58ff14529
-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