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

Commit 540772fa authored by C. Sean Young's avatar C. Sean Young Committed by Android Git Automerger
Browse files

am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to... 

am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.

* commit 'cf469989':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
parents 30a411f0 cf469989

core/cleanspec.mk

+1 −1
Original line number Diff line number Diff line
@@ -64,6 +64,6 @@ INTERNAL_CLEAN_BUILD_VERSION := 6 
# ************************************************



subdir_cleanspecs := \

    $(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git . CleanSpec.mk)

    $(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) . CleanSpec.mk)

include $(subdir_cleanspecs)

subdir_cleanspecs :=

core/config.mk

+4 −0
Original line number Diff line number Diff line
@@ -150,6 +150,10 @@ endif 
# are specific to the user's build configuration.

include $(BUILD_SYSTEM)/envsetup.mk



# Pruned directory options used when using findleaves.py

# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS

FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(OUT_DIR) $(SCAN_EXCLUDE_DIRS) .repo .git)



# The build system exposes several variables for where to find the kernel

# headers:

#   TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ endef 
# $(1): directory to search under

# Ignores $(1)/Android.mk

define first-makefiles-under

$(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git \

$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) \

        --mindepth=2 $(1) Android.mk)

endef

core/envsetup.mk

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 
# the bottom for the full list

#     OUT_DIR is also set to "out" if it's not already set.

#         this allows you to set it to somewhere else if you like

#     SCAN_EXCLUDE_DIRS is an optional, whitespace separated list of

#         directories that will also be excluded from full checkout tree

#         searches for source or make files, in addition to OUT_DIR.

#         This can be useful if you set OUT_DIR to be a different directory

#         than other outputs of your build system.



# Set up version information.

include $(BUILD_SYSTEM)/version_defaults.mk

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ ifneq ($(dont_bother),true) 
# Can't use first-makefiles-under here because

# --mindepth=2 makes the prunes not work.

subdir_makefiles := \

	$(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git $(subdirs) Android.mk)

	$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) $(subdirs) Android.mk)



$(foreach mk, $(subdir_makefiles), $(info including $(mk) ...)$(eval include $(mk)))