Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.

Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f

diff --git a/core/binary.mk b/core/binary.mk
index 87a5b5f..57cda83 100644 (file)
--- 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