Merge "Don't build tests in normal builds" am: 4bf332a56b

am: d364511ce7

Change-Id: I2c14f111bcd2a1425c8bdb92e974e2c4af0ea12c
This commit is contained in:
Colin Cross 2017-02-13 22:46:05 +00:00 committed by android-build-merger
commit 3ad23fd09e
1 changed files with 0 additions and 9 deletions

View File

@ -1078,15 +1078,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))