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

Commit 3b2ec594 authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Generate partial ota update package if the board defines it" am: f6923467 am: 8d70b612 

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

Change-Id: I98ab96f893e1187b8297e35dc86c66ffde3bbbeb
parents 790d85a0 8d70b612

core/Makefile

+19 −9
Original line number Diff line number Diff line
@@ -4836,7 +4836,7 @@ ifeq ($(build_ota_package),true) 
# $(1): output file

# $(2): additional args

define build-ota-package-target

PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \

PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$(dir $(ZIP2ZIP)):$$PATH \

    $(OTA_FROM_TARGET_FILES) \

        --verbose \

        --extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \
@@ -4846,11 +4846,11 @@ PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \ 
        $(BUILT_TARGET_FILES_PACKAGE) $(1)

endef



name := $(TARGET_PRODUCT)

product_name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

  product_name := $(product_name)_debug

endif

name := $(name)-ota-$(FILE_NAME_TAG)

name := $(product_name)-ota-$(FILE_NAME_TAG)



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

INTERNAL_OTA_METADATA := $(PRODUCT_OUT)/ota_metadata
@@ -4865,11 +4865,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_ 
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)



ifeq ($(BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE),true)

name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-ota-retrofit-$(FILE_NAME_TAG)

name := $(product_name)-ota-retrofit-$(FILE_NAME_TAG)



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

$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
@@ -4886,6 +4882,20 @@ otapackage otardppackage: $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TAR 


endif # BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE



ifneq ($(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST),)

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)

	@echo "Package partial OTA: $@"

	$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --partial "$(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST)")



.PHONY: partialotapackage

partialotapackage: $(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET)



endif # BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST



endif    # build_ota_package



# -----------------------------------------------------------------

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -1715,6 +1715,7 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
    $(INTERNAL_UPDATE_PACKAGE_TARGET) \

    $(INTERNAL_OTA_PACKAGE_TARGET) \

    $(INTERNAL_OTA_METADATA) \

    $(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET) \

    $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET) \

    $(BUILT_OTATOOLS_PACKAGE) \

    $(SYMBOLS_ZIP) \