Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0513c0be authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit 'f7592d98':
  Run clean steps in only given paths when using mm/mmm
parents 2e88b67d f7592d98

core/cleanbuild.mk

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ else 
    $(info Clean step: $(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 :=

endif

CURRENT_CLEAN_BUILD_VERSION :=

core/cleanspec.mk

+7 −1
Original line number Diff line number Diff line
@@ -63,7 +63,13 @@ INTERNAL_CLEAN_BUILD_VERSION := 6 
# 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 := \

    $(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)

cs_subdirs :=

subdir_cleanspecs :=