Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.

Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
2012-06-12 15:52:58 -07:00 · 2012-06-12 15:52:58 -07:00 · 8e53708ab1
parent 2897f052d4
commit 8e53708ab1
1 changed files with 1 additions and 1 deletions
--- 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