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

Commit d42110ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 850b65ed e6481c1b

core/main.mk

+1 −3
Original line number Diff line number Diff line
@@ -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.