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

Commit 83db9510 authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Use Soong-defined system image's artifacts in target_files.zip 

To ensure the artifacts is ready, add SOONG_DEFINED_SYSTEM_IMAGE_PATH
as an explict dependency of target_files

Bug: 350599478
Test: m dist
Test: check ninja deps
Change-Id: I7adf5c55a3b52da2bd160f930b6f6f100e648e86
parent 1d09815d

core/Makefile

+12 −4
Original line number Diff line number Diff line
@@ -3588,10 +3588,10 @@ ifeq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true) 
ifeq ($(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE),)

$(error PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE must be set if USE_SOONG_DEFINED_SYSTEM_IMAGE is true)

endif

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

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

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

soong_defined_system_image :=

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)

$(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

	$(call build-systemimage-target,$@)
@@ -6134,6 +6134,9 @@ $(BUILT_TARGET_FILES_PACKAGE): zip_root := $(intermediates)/$(name) 
$(BUILT_TARGET_FILES_DIR): zip_root := $(intermediates)/$(name)

$(BUILT_TARGET_FILES_DIR): intermediates := $(intermediates)



ifneq ($(SOONG_DEFINED_SYSTEM_IMAGE_PATH),)

  $(BUILT_TARGET_FILES_DIR): $(SOONG_DEFINED_SYSTEM_IMAGE_PATH)

endif



# $(1): Directory to copy

# $(2): Location to copy it to
@@ -6620,8 +6623,13 @@ endif 
endif # INSTALLED_VENDOR_BOOTIMAGE_TARGET

ifdef BUILDING_SYSTEM_IMAGE

	@# Contents of the system image

ifneq ($(SOONG_DEFINED_SYSTEM_IMAGE_PATH),)

	$(hide) $(call package_files-copy-root, \

	    $(SOONG_DEFINED_SYSTEM_IMAGE_BASE)/root/system,$(zip_root)/SYSTEM)

else

	$(hide) $(call package_files-copy-root, \

	    $(SYSTEMIMAGE_SOURCE_DIR),$(zip_root)/SYSTEM)

endif

else ifdef INSTALLED_BUILD_PROP_TARGET

	@# Copy the system build.prop even if not building a system image

	@# because add_img_to_target_files may need it to build other partition