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

Commit 917f8c32 authored by Cole Faust's avatar Cole Faust
Browse files

Depend on the staging dir files from soong-built image 

The soong-built image will no longer copy its files to the staging
dir itself, those files will now be copied by an android_device
module in soong-only builds. However, for soong+make builds, we
need the copy to still happen, so do it in make.

Bug: 376727180
Test: m
Change-Id: I765d6afa6dad17cf34f37647caaf6fcc63f3ae9a
parent 77eb4ba2

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3602,7 +3602,7 @@ $(error PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE must be set if USE_SOONG_DEFINED_SYST 
endif

SOONG_DEFINED_SYSTEM_IMAGE_PATH := $(call intermediates-dir-for,ETC,$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE))/$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE)

SOONG_DEFINED_SYSTEM_IMAGE_BASE := $(dir $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_FILELIST))

$(BUILT_SYSTEMIMAGE): $(INSTALLED_FILES_FILE) $(systemimage_intermediates)/file_list.txt $(SOONG_DEFINED_SYSTEM_IMAGE_PATH)

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(systemimage_intermediates)/file_list.txt $(SOONG_DEFINED_SYSTEM_IMAGE_PATH)

$(eval $(call copy-one-file, $(SOONG_DEFINED_SYSTEM_IMAGE_PATH), $(BUILT_SYSTEMIMAGE)))

else

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(systemimage_intermediates)/file_list.txt