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

Commit 235076ff authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cf_system_root_files" into main am: 94d50220 

Original change: https://android-review.googlesource.com/c/platform/build/+/3163175



Change-Id: I6b864e73b7179186ffd4e68d096b754df1927bc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9180bff 94d50220

core/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -3582,8 +3582,19 @@ $(systemimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT)/%,$(FULL_ 
ifeq ($(BOARD_AVB_ENABLE),true)

$(BUILT_SYSTEMIMAGE): $(BOARD_AVB_SYSTEM_KEY_PATH)

endif



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 :=

else

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

	$(call build-systemimage-target,$@)

endif



$(call declare-1p-container,$(BUILT_SYSTEMIMAGE),system/extras)

$(call declare-container-license-deps,$(BUILT_SYSTEMIMAGE),$(FULL_SYSTEMIMAGE_DEPS),$(PRODUCT_OUT)/:/)