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

Commit e30acf1b authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Parallelize generation of OTA package and target_file packing 

ota_from_target_files no longer requires a zipped target file, so switch
dependency to the target_files dir. This allows build system to
parallize generation of OTA package and target file packing

Test: th
Bug: 227848550
Bug: 277028723
Change-Id: I03fb9191de3b3316ed288eaac8ae84370c2fb598
parent 6b10e15a

core/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -6387,11 +6387,10 @@ define build-ota-package-target 
PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$(dir $(ZIP2ZIP)):$$PATH \

    $(OTA_FROM_TARGET_FILES) \

        --verbose \

        --extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \

        --path $(HOST_OUT) \

        $(if $(OEM_OTA_CONFIG), --oem_settings $(OEM_OTA_CONFIG)) \

        $(2) \

        $(BUILT_TARGET_FILES_PACKAGE) $(1)

        $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) $(1)

endef



product_name := $(TARGET_PRODUCT)
@@ -6407,7 +6406,7 @@ $(call declare-0p-target,$(INTERNAL_OTA_METADATA)) 


$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)

$(INTERNAL_OTA_PACKAGE_TARGET): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_OTA_METADATA)

$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_FILES) $(INTERNAL_OTATOOLS_FILES)

$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_DIR) $(OTA_FROM_TARGET_FILES) $(INTERNAL_OTATOOLS_FILES)

	@echo "Package OTA: $@"

	$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --output_metadata_path $(INTERNAL_OTA_METADATA))
@@ -6443,7 +6442,7 @@ name := $(product_name)-partial-ota-$(FILE_NAME_TAG) 


INTERNAL_OTA_PARTIAL_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

$(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)

$(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_FILES) $(INTERNAL_OTATOOLS_FILES)

$(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET): $(BUILT_TARGET_FILES_DIR) $(OTA_FROM_TARGET_FILES) $(INTERNAL_OTATOOLS_FILES)

	@echo "Package partial OTA: $@"

	$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --partial "$(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST)")
@@ -6766,7 +6765,7 @@ ifneq (true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS)) 
# For real devices and for dist builds, build super image from target files to an intermediate directory.

INTERNAL_SUPERIMAGE_DIST_TARGET := $(call intermediates-dir-for,PACKAGING,super.img)/super.img

$(INTERNAL_SUPERIMAGE_DIST_TARGET): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))

$(INTERNAL_SUPERIMAGE_DIST_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)

$(INTERNAL_SUPERIMAGE_DIST_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_DIR) $(BUILD_SUPER_IMAGE)

	$(call pretty,"Target super fs image from target files: $@")

	PATH=$(dir $(LPMAKE)):$$PATH \

	    $(BUILD_SUPER_IMAGE) -v $(extracted_input_target_files) $@