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

Commit 46c9cfa1 authored by Jeff Gaston's avatar Jeff Gaston Committed by android-build-merger
Browse files

Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e... 

Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e am: 8467fba0 am: 12a4b403
am: 97079e05

Change-Id: I19389b739e792372fa1d189d030c5a1d618b7b19
parents a92b602b 97079e05

core/cleanspec.mk

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



subdir_cleanspecs := \

    $(file <$(OUT_DIR)/.module_paths/CleanSpec.mk.list)

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

include $(subdir_cleanspecs)

subdir_cleanspecs :=

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ ifneq ($(dont_bother),true) 
# Include all of the makefiles in the system

#



subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list)

subdir_makefiles := $(SOONG_ANDROID_MK) $(call first-makefiles-under,$(TOP))

subdir_makefiles_total := $(words $(subdir_makefiles))

.KATI_READONLY := subdir_makefiles_total