StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include soong installs file before Android.mk files" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-15 23:39:21 +00:00
committed by Gerrit Code Review
parent 850b65edc9 e6481c1b4c
commit d42110ca87
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -276,7 +276,7 @@ FULL_BUILD := true
# Include all of the makefiles in the system # 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 # Android.mk files are only used on Linux builds, Mac only supports Android.bp
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
subdir_makefiles += $(file <$(OUT_DIR)/.module_paths/Android.mk.list) 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))) $(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 # For an unbundled image, we can skip blueprint_tools because unbundled image
# aims to remove a large number framework projects from the manifest, the # aims to remove a large number framework projects from the manifest, the
# sources or dependencies for these tools may be missing from the tree. # sources or dependencies for these tools may be missing from the tree.