commit b447598f6900f05f0b1940a0731ee374c57c3100
author Calin Juravle <calin@google.com> Thu Jul 02 17:23:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 02 17:23:56 2015 +0000
tree d5ea2d002438df20bfeae45160ed19e05b34f7b3
parent aefdcd9a06bc436a0f0908230856d1054018cd93
parent 4895ea4eb55a06003cc08cda55a6dca1c42a1794

Merge "Disable static builds for mac and asan."

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 02ef0c6..77f39c4 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -35,6 +35,15 @@
 ART_BUILD_HOST_DEBUG ?= true
 ART_BUILD_HOST_STATIC ?= true
 
+# Asan does not support static linkage
+ifdef SANITIZE_HOST
+  ART_BUILD_HOST_STATIC := false
+endif
+
+ifneq ($$(HOST_OS),linux)
+  ART_BUILD_HOST_STATIC := false
+endif
+
 ifeq ($(ART_BUILD_TARGET_NDEBUG),false)
 $(info Disabling ART_BUILD_TARGET_NDEBUG)
 endif