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

Commit fa920b31 authored by JP Abgrall's avatar JP Abgrall Committed by Android (Google) Code Review
Browse files

Merge "core: don't hardcode "out" during findleaves.py invocations."

parents 4550fe1d 1390cac3

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 --prune=.repo --prune=.git . CleanSpec.mk)

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

include $(subdir_cleanspecs)

subdir_cleanspecs :=

core/definitions.mk

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

# Ignores $(1)/Android.mk

define first-makefiles-under

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

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

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

endef

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ else # ONE_SHOT_MAKEFILE 
# Can't use first-makefiles-under here because

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

subdir_makefiles := \

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

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



include $(subdir_makefiles)