commit c2ac7201a728fe0170900e02833399e80810802e
author Dan Albert <danalbert@google.com> Tue Apr 14 23:08:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 14 23:08:47 2015 +0000
tree 5142f8de9ef0383dbaa53e388e28b381b7e8384f
parent 30f6657d43b97f4d0dbc68a25500dd17d01d6387
parent 803cf699262275a771e3211751e77d2817718656

am 803cf699: am 5e7e6d75: am 2d215e38: Merge "Use libcompiler_rt-extras on the host too."

* commit '803cf699262275a771e3211751e77d2817718656':
  Use libcompiler_rt-extras on the host too.

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 03c46df..2a2a2f9 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -205,7 +205,7 @@
 endif
 
 # Add in libcompiler_rt for all regular device builds
-ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
+ifeq (,$(LOCAL_SDK_VERSION)$(WITHOUT_LIBCOMPILER_RT))
   my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif