From ae58e2bfa5aab16e502527500da9762115aee469 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 4 Oct 2016 16:21:49 -0700 Subject: [PATCH] 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 --- core/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index da4784f172..07e9b3c2ee 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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: