aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-05-15 23:39:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-15 23:39:21 +0000
commitd42110ca87ac20259c50f057fa6cbcd64c00b3ad (patch)
treea892ed7904e5c9a5de8c91a6a3b10a3ff1a59052
parent850b65edc9eea66406692a93896ef9362e1dd6a8 (diff)
parente6481c1b4c75ea73249bd60a33ddea8b4753b26a (diff)
downloadbuild-master.tar.gz
Merge "Include soong installs file before Android.mk files" into mainHEADmastermain
-rw-r--r--core/main.mk4
1 files changed, 1 insertions, 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.