From 7a14ec7968d6a65b12310731f4556893874c52b7 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 20 Dec 2016 16:18:04 -0800
Subject: [PATCH] Don't build tests in normal builds

Treehugger will catch test breakages before they are submitted, it
is no longer necessary for all developers to wait for all tests to
build.

Test: m -j
Bug: 32221202
Change-Id: Ia1ed939fa28a80df10248b9f5c2f298b1e5d2053
---
 core/main.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 77b213c68..0d15c3fda 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1032,15 +1032,6 @@ tests : host-tests target-tests
 # Phony target to run all java compilations that use javac instead of jack.
 .PHONY: javac-check
 
-# 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
-
 ifneq (,$(filter samplecode, $(MAKECMDGOALS)))
 .PHONY: samplecode
 sample_MODULES := $(sort $(call get-tagged-modules,samples))