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

Commit 6ff29067 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Build otatools files before building OTA packages." am: 49ccbb37 am:... 

Merge "Build otatools files before building OTA packages." am: 49ccbb37 am: e5491533 am: 97abaede

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

Change-Id: Idc53a74c335b446907300b6bbb6661cd08197a38
parents fdad123a 97abaede

core/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -4773,7 +4773,7 @@ INTERNAL_OTA_METADATA := $(PRODUCT_OUT)/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_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(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))
@@ -4791,7 +4791,8 @@ INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name 
$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)

$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(OTA_FROM_TARGET_FILES)

    $(OTA_FROM_TARGET_FILES) \

    $(INTERNAL_OTATOOLS_FILES)

	@echo "Package OTA (retrofit dynamic partitions): $@"

	$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --retrofit_dynamic_partitions)