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

Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev

Browse Source
This commit is contained in:
Ying Wang
2012-09-28 10:24:40 -07:00
committed by Android (Google) Code Review
parent 0bc0394688 9cb3731a77
commit f7592d987d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/cleanbuild.mk
View File

@@ -78,6 +78,10 @@ else
$(info Clean step: $(INTERNAL_CLEAN_STEP.$(step))) \ $(info Clean step: $(INTERNAL_CLEAN_STEP.$(step))) \
$(shell $(INTERNAL_CLEAN_STEP.$(step))) \ $(shell $(INTERNAL_CLEAN_STEP.$(step))) \
) )
# If we are running mm/mmm, we should copy over the other clean steps too.
ifneq ($(ONE_SHOT_MAKEFILE),)
INTERNAL_CLEAN_STEPS := $(strip $(CURRENT_CLEAN_STEPS) $(steps))
endif
steps := steps :=
endif endif
CURRENT_CLEAN_BUILD_VERSION := CURRENT_CLEAN_BUILD_VERSION :=

8
core/cleanspec.mk
View File

@@ -63,7 +63,13 @@ INTERNAL_CLEAN_BUILD_VERSION := 6
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************
ifneq ($(ONE_SHOT_MAKEFILE),)
cs_subdirs := $(dir $(ONE_SHOT_MAKEFILE))
else
cs_subdirs := .
endif
subdir_cleanspecs := \ subdir_cleanspecs := \
$(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git . CleanSpec.mk) $(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git $(cs_subdirs) CleanSpec.mk)
include $(subdir_cleanspecs) include $(subdir_cleanspecs)
cs_subdirs :=
subdir_cleanspecs := subdir_cleanspecs :=