summaryrefslogtreecommitdiffstats
path: root/core/binary.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2012-06-11 14:53:34 -0700
committerStephen Hines <srhines@google.com>2012-06-12 13:34:50 -0700
commitc72f39664d6e6a9d15b912cd72e7bcef121fcc11 (patch)
treed847f9798119e9c4a21043efaa6d678d16fb6051 /core/binary.mk
parent6e11c2de4aa3f1b2327566b9a3d2e43a504831b9 (diff)
downloadbuild-c72f39664d6e6a9d15b912cd72e7bcef121fcc11.zip
build-c72f39664d6e6a9d15b912cd72e7bcef121fcc11.tar.gz
build-c72f39664d6e6a9d15b912cd72e7bcef121fcc11.tar.bz2
EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.
Change-Id: I463217aef573a28069469514ad94cd85a7f38bea
Diffstat (limited to 'core/binary.mk')
-rw-r--r--core/binary.mk5
1 files changed, 5 insertions, 0 deletions
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 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
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)