commit 676ff8e35bf15a7551d264598cfaf1e97bcfa9aa
author Calin Juravle <calin@google.com> Fri Jul 24 16:45:26 2015 +0100
committer Calin Juravle <calin@google.com> Fri Jul 24 16:45:26 2015 +0100
tree 95e6a40befb0caab5e7a08c9080664e62a58fe33
parent f7efc9ef90c38212f8c4fbece99080f784a53181

Enable art host static builds only for checkbuilds.

Change-Id: I42cc850089a5ecbcc201699f0b996da4fd959bb3

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 2c552e6..05cfc42 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -33,7 +33,13 @@
 ART_BUILD_TARGET_DEBUG ?= true
 ART_BUILD_HOST_NDEBUG ?= true
 ART_BUILD_HOST_DEBUG ?= true
-ART_BUILD_HOST_STATIC ?= true
+
+# Enable the static builds only for checkbuilds.
+ifneq (,$(filter checkbuild,$(MAKECMDGOALS)))
+  ART_BUILD_HOST_STATIC ?= true
+else
+  ART_BUILD_HOST_STATIC ?= false
+endif
 
 # Asan does not support static linkage
 ifdef SANITIZE_HOST