commit c72f39664d6e6a9d15b912cd72e7bcef121fcc11
author Stephen Hines <srhines@google.com> Mon Jun 11 14:53:34 2012 -0700
committer Stephen Hines <srhines@google.com> Tue Jun 12 13:34:50 2012 -0700
tree d847f9798119e9c4a21043efaa6d678d16fb6051
parent 6e11c2de4aa3f1b2327566b9a3d2e43a504831b9

EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.

Change-Id: I463217aef573a28069469514ad94cd85a7f38bea

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 04ac90b..87a5b5f 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -132,6 +132,11 @@
   LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
 
+# Add in libcompiler-rt for all device builds
+ifndef LOCAL_IS_HOST_MODULE
+  LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
+endif
+
 my_compiler_dependencies :=
 ifeq ($(strip $(LOCAL_CLANG)),true)
   LOCAL_CFLAGS += $(CLANG_CONFIG_EXTRA_CFLAGS)