Merge "Build and use ota_from_target_files as a module." (b7957f11) · Commits · e / os / android_build

core/Makefile

+12 −28

Original line number	Diff line number	Diff line
		@@ -3658,6 +3658,7 @@ INTERNAL_OTATOOLS_MODULES := \
		mksquashfs \
		mksquashfsimage.sh \
		mkuserimg_mke2fs \
		ota_from_target_files \
		sefcontext_compile \
		sgdisk \
		shflags \
		@@ -4322,7 +4323,7 @@ ifeq ($(build_ota_package),true)
		# $(2): additional args
		define build-ota-package-target
		PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \
		build/make/tools/releasetools/ota_from_target_files \
		$(OTA_FROM_TARGET_FILES) \
		--verbose \
		--extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \
		--path $(HOST_OUT) \
		@@ -4338,21 +4339,11 @@ endif
		name := $(name)-ota-$(FILE_NAME_TAG)

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

		INTERNAL_OTA_METADATA := $(PRODUCT_OUT)/ota_metadata

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

		ifeq ($(AB_OTA_UPDATER),true)
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BRILLO_UPDATE_PAYLOAD)
		else
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BROTLI)
		endif

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

		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \
		build/make/tools/releasetools/ota_from_target_files
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_FILES)
		@echo "Package OTA: $@"
		$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --output_metadata_path $(INTERNAL_OTA_METADATA))

		@@ -4367,17 +4358,10 @@ endif
		name := $(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)

		ifeq ($(AB_OTA_UPDATER),true)
		$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): $(BRILLO_UPDATE_PAYLOAD)
		else
		$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): $(BROTLI)
		endif

		$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \
		build/make/tools/releasetools/ota_from_target_files
		$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): \
		$(BUILT_TARGET_FILES_PACKAGE) \
		$(OTA_FROM_TARGET_FILES)
		@echo "Package OTA (retrofit dynamic partitions): $@"
		$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --retrofit_dynamic_partitions)

core/config.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -608,6 +608,7 @@ CHECK_ELF_FILE := build/make/tools/check_elf_file.py
		LPMAKE := $(HOST_OUT_EXECUTABLES)/lpmake$(HOST_EXECUTABLE_SUFFIX)
		BUILD_IMAGE := $(HOST_OUT_EXECUTABLES)/build_image$(HOST_EXECUTABLE_SUFFIX)
		BUILD_SUPER_IMAGE := $(HOST_OUT_EXECUTABLES)/build_super_image$(HOST_EXECUTABLE_SUFFIX)
		OTA_FROM_TARGET_FILES := $(HOST_OUT_EXECUTABLES)/ota_from_target_files$(HOST_EXECUTABLE_SUFFIX)

		PROGUARD_HOME := external/proguard
		PROGUARD := $(PROGUARD_HOME)/bin/proguard.sh
		@@ -623,7 +624,6 @@ BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer
		FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host
		VBOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/vboot_signer
		FEC := $(HOST_OUT_EXECUTABLES)/fec
		BRILLO_UPDATE_PAYLOAD := $(HOST_OUT_EXECUTABLES)/brillo_update_payload

		DEXDUMP := $(HOST_OUT_EXECUTABLES)/dexdump$(BUILD_EXECUTABLE_SUFFIX)
		PROFMAN := $(HOST_OUT_EXECUTABLES)/profman

tools/releasetools/Android.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,22 @@ python_binary_host {
		],
		}

		python_binary_host {
		name: "ota_from_target_files",
		defaults: ["releasetools_binary_defaults"],
		srcs: [
		"edify_generator.py",
		"ota_from_target_files.py",
		],
		libs: [
		"releasetools_common",
		"releasetools_verity_utils",
		],
		required: [
		"brillo_update_payload",
		],
		}

		python_defaults {
		name: "releasetools_test_defaults",
		srcs: [