Commit ae58e2bf authored Oct 04, 2016 by Colin Cross

Don't prune $(OUT_DIR) from findleaves.py

Pruning $(OUT_DIR) can be overaggressive if $(OUT_DIR) matches the name
of any directory in the source tree that contains Android.mk files.
Pruning $(OUT_DIR) is no longer necessary, as one of the first things
the build system does is put an empty Android.mk file in there to avoid
recursing into it.

Bug: 31941856
Test: m -j OUT_DIR=angler
Change-Id: I7c5e95816f35bd5906845716d56cca76de7fa1ad

parent 70209ad9

core/config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ 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)
		FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)

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