p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
This commit is contained in:
C. Sean Young 2015-06-12 16:29:25 +00:00 committed by Android Git Automerger
parent 30b16ac6a4 540772fa22
commit cbaead4cfe
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/cleanspec.mk
View File

@ -64,6 +64,6 @@ INTERNAL_CLEAN_BUILD_VERSION := 6
# ************************************************ # ************************************************
subdir_cleanspecs := \ 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) include $(subdir_cleanspecs)
subdir_cleanspecs := subdir_cleanspecs :=

4
core/config.mk
View File

@ -150,6 +150,10 @@ endif
# are specific to the user's build configuration. # are specific to the user's build configuration.
include $(BUILD_SYSTEM)/envsetup.mk 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 # The build system exposes several variables for where to find the kernel
# headers: # headers:
# TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current # TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current

2
core/definitions.mk
View File

@ -150,7 +150,7 @@ endef
# $(1): directory to search under # $(1): directory to search under
# Ignores $(1)/Android.mk # Ignores $(1)/Android.mk
define first-makefiles-under 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) --mindepth=2 $(1) Android.mk)
endef endef

5
core/envsetup.mk
View File

@ -5,6 +5,11 @@
# the bottom for the full list # the bottom for the full list
# OUT_DIR is also set to "out" if it's not already set. # 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 # 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. # Set up version information.
include $(BUILD_SYSTEM)/version_defaults.mk include $(BUILD_SYSTEM)/version_defaults.mk

2
core/main.mk
View File

@ -513,7 +513,7 @@ ifneq ($(dont_bother),true)
# Can't use first-makefiles-under here because # Can't use first-makefiles-under here because
# --mindepth=2 makes the prunes not work. # --mindepth=2 makes the prunes not work.
subdir_makefiles := \ 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))) $(foreach mk, $(subdir_makefiles), $(info including $(mk) ...)$(eval include $(mk)))