commit 82f6383fa6bcfc060bbe631b8dab570e3691bb88
author Ying Wang <wangying@android.com> Tue Jun 23 16:57:30 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 23 16:57:30 2015 +0000
tree 3c2349f22395d7637c68c70417a5130ae96946ef
parent 3d81b7d627b5076e8e850fca6233bd071f4f7c42
parent cd5bee3546278fe6027bb473e404c93175d8b1b3

Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 3bb8c04..7f561ab 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1008,11 +1008,13 @@
 tests : host-tests target-tests
 
 # To catch more build breakage, check build tests modules in eng and userdebug builds.
+ifneq ($(ANDROID_NO_TEST_CHECK),true)
 ifneq ($(TARGET_BUILD_PDK),true)
 ifneq ($(filter eng userdebug,$(TARGET_BUILD_VARIANT)),)
 droidcore : target-tests host-tests
 endif
 endif
+endif
 
 .PHONY: lintall