Merge "Don't build tests in normal builds" am: 4bf332a56b (3ad23fd0) · Commits · e / os / android_build

core/main.mk

+0 −9

Original line number	Diff line number	Diff line
		@@ -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))