From 8e53708ab11fe736dc2a9bda2e923599ba8c503b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 12 Jun 2012 15:52:58 -0700 Subject: [PATCH] Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK. Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f --- core/binary.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/binary.mk b/core/binary.mk index 87a5b5f42..57cda8348 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