commit bec4a4b980261e35155cb53981ad39ef5423109a
author Stephen Hines <srhines@google.com> Tue Jun 26 16:38:21 2012 -0700
committer Stephen Hines <srhines@google.com> Tue Jun 26 16:38:21 2012 -0700
tree ecc86dcb27727a1aab48027cea6a3d71acc30d86
parent 5db58642f9af66f2b88c7d2bc88ee4ccde973656

Disable libcompiler-rt-extras for BUILD_TINY_ANDROID.

Change-Id: I05aa9e43f987ef422d98f43b3734dfbc261feb4b

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 8918e47..23bbc81 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -132,8 +132,8 @@
   LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
 
-# Add in libcompiler-rt for all device builds
-ifeq (,$(LOCAL_NDK_VERSION)$(LOCAL_IS_HOST_MODULE))
+# Add in libcompiler-rt for all regular device builds
+ifeq (,$(LOCAL_NDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(BUILD_TINY_ANDROID))
   LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif