summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2015-07-02 18:21:14 +0100
committer Calin Juravle <calin@google.com> 2015-07-02 18:22:51 +0100
commit4895ea4eb55a06003cc08cda55a6dca1c42a1794 (patch)
tree315c10aca1edbc4b87c40da715d8d80ca12d183a
parent06b6da5ccbf9246c697b8cf1be0ba58ce616521d (diff)
Disable static builds for mac and asan.
- asan doesn't support static linkage - we don't need a static build of dex2oat for mac Change-Id: I7eddd19f1f47e8b2a67ecc0aaf40cb70941febdd
-rw-r--r--build/Android.common_build.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 02ef0c6206..77f39c49e9 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -35,6 +35,15 @@ ART_BUILD_HOST_NDEBUG ?= true
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