From e6481c1b4c75ea73249bd60a33ddea8b4753b26a Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 15 May 2024 15:26:39 -0700 Subject: [PATCH] Include soong installs file before Android.mk files I changed the installs file to be after Android.mk files in aosp/3080639, in order to minimize the information given to Android.mk files. But it appears that some exotic vendor builds actually rely on this information (when they shouldn't). Bug: 340254841 Test: diff'd out/target/product//installed-files-vendor.txt before/after this cl, and with a revert of aosp/3080639 Change-Id: I00a06fe984397e4dba57352850f5e2484d17f657 --- core/main.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/main.mk b/core/main.mk index d700fcb231..62fa53d08e 100644 --- a/core/main.mk +++ b/core/main.mk @@ -276,7 +276,7 @@ FULL_BUILD := true # Include all of the makefiles in the system # -subdir_makefiles := $(SOONG_ANDROID_MK) +subdir_makefiles := $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT).mk $(SOONG_ANDROID_MK) # Android.mk files are only used on Linux builds, Mac only supports Android.bp ifeq ($(HOST_OS),linux) subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list) @@ -287,8 +287,6 @@ subdir_makefiles_total := $(words int $(subdir_makefiles) post finish) $(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk))) -include $(SOONG_OUT_DIR)/installs-$(TARGET_PRODUCT).mk - # For an unbundled image, we can skip blueprint_tools because unbundled image # aims to remove a large number framework projects from the manifest, the # sources or dependencies for these tools may be missing from the tree.