StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove checkbuild and test from parse time goals

Browse Source 
The tests goal is not a parse time goal.

The checkbuild goal is only a parse time goal so that it doesn't result
in a circular dependency between droid and checkbuild when
ANDROID_BUILD_EVERYTHING_BY_DEFAULT is set.  Get rid of the circular
dependency by making droid depend on droid_targets, and droid_targets
depend on the targets that are normally built for droid.  checkbuild can
then always depend on droid_targets, and droid can condtionally depend
on checkbuild without introducing a circular dependency.

Bug: 24413153
Change-Id: I231d80e05ffe321384a5efbcdf5578f86ad84da0
This commit is contained in:
Colin Cross
2015-09-25 16:43:36 -07:00
parent 67020d2338
commit c53d6b90b3
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/main.mk
View File

@@ -60,7 +60,10 @@ BUILD_SYSTEM := $(TOPDIR)build/core
# This is the default target. It must be the first declared target. # This is the default target. It must be the first declared target.
.PHONY: droid .PHONY: droid
DEFAULT_GOAL := 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. # Used to force goals to build. Only use for conditionally defined goals.
.PHONY: FORCE .PHONY: FORCE
@@ -836,12 +839,9 @@ files: prebuilt \
# ------------------------------------------------------------------- # -------------------------------------------------------------------
.PHONY: checkbuild .PHONY: checkbuild
checkbuild: $(modules_to_check) checkbuild: $(modules_to_check) droid_targets
ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT)$(filter $(MAKECMDGOALS),checkbuild)) ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT))
droid: checkbuild droid: checkbuild
else
# ANDROID_BUILD_EVERYTHING_BY_DEFAULT not set, or checkbuild is one of the cmd goals.
checkbuild: droid
endif endif
.PHONY: ramdisk .PHONY: ramdisk
@@ -937,7 +937,7 @@ ifneq ($(TARGET_BUILD_APPS),)
.PHONY: apps_only .PHONY: apps_only
apps_only: $(unbundled_build_modules) apps_only: $(unbundled_build_modules)
droid: apps_only droid_targets: apps_only
# Combine the NOTICE files for a apps_only build # Combine the NOTICE files for a apps_only build
$(eval $(call combine-notice-files, \ $(eval $(call combine-notice-files, \
@@ -983,7 +983,7 @@ else # TARGET_BUILD_APPS
endif endif
# Building a full system-- the default is to build droidcore # Building a full system-- the default is to build droidcore
droid: droidcore dist_files droid_targets: droidcore dist_files
endif # TARGET_BUILD_APPS endif # TARGET_BUILD_APPS

2
core/ninja.mk
View File

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