summaryrefslogtreecommitdiffstats
path: root/core/binary.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-06-12 15:52:58 -0700
committerYing Wang <wangying@google.com>2012-06-12 15:52:58 -0700
commit8e53708ab11fe736dc2a9bda2e923599ba8c503b (patch)
tree396e2265f5597fa15d0aa813588b42697aefcf4f /core/binary.mk
parent2897f052d446faf264f9a01d14ae493f8cfd06ad (diff)
downloadbuild-8e53708ab11fe736dc2a9bda2e923599ba8c503b.zip
build-8e53708ab11fe736dc2a9bda2e923599ba8c503b.tar.gz
build-8e53708ab11fe736dc2a9bda2e923599ba8c503b.tar.bz2
Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.
Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
Diffstat (limited to 'core/binary.mk')
-rw-r--r--core/binary.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk
index 87a5b5f..57cda83 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -133,7 +133,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
endif
# Add in libcompiler-rt for all device builds
-ifndef LOCAL_IS_HOST_MODULE
+ifeq (,$(LOCAL_NDK_VERSION)$(LOCAL_IS_HOST_MODULE))
LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
endif