commit ba973b0169f2a2495fecfa41e928d388ebfc19d4
author Calin Juravle <calin@google.com> Thu Jul 02 17:33:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 02 17:33:01 2015 +0000
tree d5ea2d002438df20bfeae45160ed19e05b34f7b3
parent 9fc5eea81689f548879ac1dc3a65baea840a6e6d
parent b447598f6900f05f0b1940a0731ee374c57c3100

am b447598f: Merge "Disable static builds for mac and asan."

* commit 'b447598f6900f05f0b1940a0731ee374c57c3100':
  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