am ad4b1ef6: am 581a028f: Merge "Remove checkbuild and test from parse time goals" (06f75b5f) · Commits · e / os / android_build

core/main.mk

+8 −8

Original line number	Diff line number	Diff line
		@@ -60,7 +60,10 @@ BUILD_SYSTEM := $(TOPDIR)build/core
		# This is the default target. It must be the first declared target.
		.PHONY: droid
		DEFAULT_GOAL := droid
		$(DEFAULT_GOAL):
		$(DEFAULT_GOAL): droid_targets

		.PHONY: droid_targets
		droid_targets:

		# Used to force goals to build. Only use for conditionally defined goals.
		.PHONY: FORCE
		@@ -842,12 +845,9 @@ files: prebuilt \
		# -------------------------------------------------------------------

		.PHONY: checkbuild
		checkbuild: $(modules_to_check)
		ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT)$(filter $(MAKECMDGOALS),checkbuild))
		checkbuild: $(modules_to_check) droid_targets
		ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT))
		droid: checkbuild
		else
		# ANDROID_BUILD_EVERYTHING_BY_DEFAULT not set, or checkbuild is one of the cmd goals.
		checkbuild: droid
		endif

		.PHONY: ramdisk
		@@ -945,7 +945,7 @@ ifneq ($(TARGET_BUILD_APPS),)
		.PHONY: apps_only
		apps_only: $(unbundled_build_modules)

		droid: apps_only
		droid_targets: apps_only

		# Combine the NOTICE files for a apps_only build
		$(eval $(call combine-notice-files, \
		@@ -991,7 +991,7 @@ else # TARGET_BUILD_APPS
		endif

		# Building a full system-- the default is to build droidcore
		droid: droidcore dist_files
		droid_targets: droidcore dist_files

		endif # TARGET_BUILD_APPS

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ NINJA_GOALS := fastincremental generateonly droid showcommands
		PARSE_TIME_MAKE_GOALS := \
		$(PARSE_TIME_MAKE_GOALS) \
		$(dont_bother_goals) \
		tests \
		APP-% \
		DUMP_% \
		ECLIPSE-% \
		@@ -16,7 +15,6 @@ PARSE_TIME_MAKE_GOALS := \
		btnod \
		build-art% \
		build_kernel-nodeps \
		checkbuild \
		clean-oat% \
		continuous_instrumentation_tests \
		continuous_native_tests \