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

Commit aeb81cb6 authored by David Anderson's avatar David Anderson Committed by Android (Google) Code Review
Browse files

Merge changes I68b2cbbd,I909239fd into main 

* changes:
  Remove retrofit dynamic partition support from otatools.
  Remove PRODUCT_RETROFIT_DYNAMIC_PARTITIONS.
parents 7a087661 307dbb62

core/Makefile

+0 −37
Original line number Diff line number Diff line
@@ -3793,13 +3793,6 @@ $(INSTALLED_FILES_FILE_SYSTEMOTHER) : $(INTERNAL_SYSTEMOTHERIMAGE_FILES) $(FILES 
$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_SYSTEMOTHER)))

$(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_SYSTEMOTHER)))



# Determines partition size for system_other.img.

ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)

ifneq ($(filter system,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)),)

INTERNAL_SYSTEM_OTHER_PARTITION_SIZE := $(BOARD_SUPER_PARTITION_SYSTEM_DEVICE_SIZE)

endif

endif



ifndef INTERNAL_SYSTEM_OTHER_PARTITION_SIZE

INTERNAL_SYSTEM_OTHER_PARTITION_SIZE:= $(BOARD_SYSTEMIMAGE_PARTITION_SIZE)

endif
@@ -6204,15 +6197,11 @@ endef 
define dump-dynamic-partitions-info

  $(if $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITIONS)), \

    echo "use_dynamic_partitions=true" >> $(1))

  $(if $(filter true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS)), \

    echo "dynamic_partition_retrofit=true" >> $(1))

  echo "lpmake=$(notdir $(LPMAKE))" >> $(1)

  $(if $(filter true,$(PRODUCT_BUILD_SUPER_PARTITION)), $(if $(BOARD_SUPER_PARTITION_SIZE), \

    echo "build_super_partition=true" >> $(1)))

  $(if $(BUILDING_SUPER_EMPTY_IMAGE), \

    echo "build_super_empty_partition=true" >> $(1))

  $(if $(filter true,$(BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE)), \

    echo "build_retrofit_dynamic_partitions_ota_package=true" >> $(1))

  echo "super_metadata_device=$(BOARD_SUPER_PARTITION_METADATA_DEVICE)" >> $(1)

  $(if $(BOARD_SUPER_PARTITION_BLOCK_DEVICES), \

    echo "super_block_devices=$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)" >> $(1))
@@ -7033,27 +7022,6 @@ $(call declare-container-license-deps,$(INTERNAL_OTA_PACKAGE_TARGET),$(BUILT_TAR 
.PHONY: otapackage

otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)



ifeq ($(BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE),true)

name := $(product_name)-ota-retrofit



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)

$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(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)



$(call declare-1p-container,$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET),)

$(call declare-container-license-deps,$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET),$(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_FILES) $(INTERNAL_OTATOOLS_FILES),$(PRODUCT_OUT)/:/)



.PHONY: otardppackage



otapackage otardppackage: $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET)



endif # BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE



ifneq ($(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST),)

name := $(product_name)-partial-ota
@@ -7420,8 +7388,6 @@ ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION)) 
# BOARD_SUPER_PARTITION_SIZE must be defined to build super image.

ifneq ($(BOARD_SUPER_PARTITION_SIZE),)



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))
@@ -7438,7 +7404,6 @@ endif 
.PHONY: superimage_dist

superimage_dist: $(INTERNAL_SUPERIMAGE_DIST_TARGET)



endif # PRODUCT_RETROFIT_DYNAMIC_PARTITIONS != "true"

endif # BOARD_SUPER_PARTITION_SIZE != ""

endif # PRODUCT_BUILD_SUPER_PARTITION == "true"
@@ -7447,7 +7412,6 @@ endif # PRODUCT_BUILD_SUPER_PARTITION == "true" 


ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION))

ifneq ($(BOARD_SUPER_PARTITION_SIZE),)

ifneq (true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS))



# Build super.img by using $(INSTALLED_*IMAGE_TARGET) to $(1)

# $(1): built image path
@@ -7502,7 +7466,6 @@ superimage-nodeps supernod: | $(INSTALLED_SUPERIMAGE_DEPENDENCIES) 
	$(call build-superimage-target,$(INSTALLED_SUPERIMAGE_TARGET),\

	  $(call intermediates-dir-for,PACKAGING,superimage-nodeps)/misc_info.txt)



endif # PRODUCT_RETROFIT_DYNAMIC_PARTITIONS != "true"

endif # BOARD_SUPER_PARTITION_SIZE != ""

endif # PRODUCT_BUILD_SUPER_PARTITION == "true"

core/config.mk

+0 −52
Original line number Diff line number Diff line
@@ -897,19 +897,6 @@ ifeq ($(call math_gt,$(BOARD_API_LEVEL),$(BOARD_GENFS_LABELS_VERSION)),true) 
  $(error BOARD_GENFS_LABELS_VERSION ($(BOARD_GENFS_LABELS_VERSION)) must be greater than or equal to BOARD_API_LEVEL ($(BOARD_API_LEVEL)))

endif



ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)

  ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

    $(error PRODUCT_USE_DYNAMIC_PARTITIONS must be true when PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \

        is set)

  endif

  ifdef PRODUCT_SHIPPING_API_LEVEL

    ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29))

      $(error Devices with shipping API level $(PRODUCT_SHIPPING_API_LEVEL) must not set \

          PRODUCT_RETROFIT_DYNAMIC_PARTITIONS)

    endif

  endif

endif



ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

    ifneq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)

        $(error PRODUCT_USE_DYNAMIC_PARTITION_SIZE must be true for devices with dynamic partitions)
@@ -1011,41 +998,6 @@ BOARD_SUPER_PARTITION_PARTITION_LIST := \ 
.KATI_READONLY := BOARD_SUPER_PARTITION_PARTITION_LIST



ifneq ($(BOARD_SUPER_PARTITION_SIZE),)

ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)



# The metadata device must be specified manually for retrofitting.

ifeq ($(BOARD_SUPER_PARTITION_METADATA_DEVICE),)

$(error Must specify BOARD_SUPER_PARTITION_METADATA_DEVICE if PRODUCT_RETROFIT_DYNAMIC_PARTITIONS=true.)

endif



# The super partition block device list must be specified manually for retrofitting.

ifeq ($(BOARD_SUPER_PARTITION_BLOCK_DEVICES),)

$(error Must specify BOARD_SUPER_PARTITION_BLOCK_DEVICES if PRODUCT_RETROFIT_DYNAMIC_PARTITIONS=true.)

endif



# The metadata device must be included in the super partition block device list.

ifeq (,$(filter $(BOARD_SUPER_PARTITION_METADATA_DEVICE),$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)))

$(error BOARD_SUPER_PARTITION_METADATA_DEVICE is not listed in BOARD_SUPER_PARTITION_BLOCK_DEVICES.)

endif



# The metadata device must be supplied to init via the kernel command-line.

INTERNAL_KERNEL_CMDLINE += androidboot.super_partition=$(BOARD_SUPER_PARTITION_METADATA_DEVICE)



BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE := true



# If "vendor" is listed as one of the dynamic partitions but without its image available (e.g. an

# AOSP target built without vendor image), don't build the retrofit full OTA package. Because we

# won't be able to build meaningful super_* images for retrofitting purpose.

ifneq (,$(filter vendor,$(BOARD_SUPER_PARTITION_PARTITION_LIST)))

ifndef BUILDING_VENDOR_IMAGE

ifndef BOARD_PREBUILT_VENDORIMAGE

BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE :=

endif # BOARD_PREBUILT_VENDORIMAGE

endif # BUILDING_VENDOR_IMAGE

endif # BOARD_SUPER_PARTITION_PARTITION_LIST



else # PRODUCT_RETROFIT_DYNAMIC_PARTITIONS



# For normal devices, we populate BOARD_SUPER_PARTITION_BLOCK_DEVICES so the

# build can handle both cases consistently.

ifeq ($(BOARD_SUPER_PARTITION_METADATA_DEVICE),)
@@ -1065,16 +1017,12 @@ endif 
ifneq ($(BOARD_SUPER_PARTITION_METADATA_DEVICE),super)

INTERNAL_KERNEL_CMDLINE += androidboot.super_partition=$(BOARD_SUPER_PARTITION_METADATA_DEVICE)

endif

BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE :=



endif # PRODUCT_RETROFIT_DYNAMIC_PARTITIONS

endif # BOARD_SUPER_PARTITION_SIZE

BOARD_SUPER_PARTITION_BLOCK_DEVICES ?=

.KATI_READONLY := BOARD_SUPER_PARTITION_BLOCK_DEVICES

BOARD_SUPER_PARTITION_METADATA_DEVICE ?=

.KATI_READONLY := BOARD_SUPER_PARTITION_METADATA_DEVICE

BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE ?=

.KATI_READONLY := BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE



$(foreach device,$(call to-upper,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)), \

    $(eval BOARD_SUPER_PARTITION_$(device)_DEVICE_SIZE := $(strip $(BOARD_SUPER_PARTITION_$(device)_DEVICE_SIZE))) \

core/main.mk

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

    $(BUILT_RAMDISK_16K_TARGET) \

    $(BUILT_KERNEL_16K_TARGET) \

    $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET) \

    $(SYMBOLS_ZIP) \

    $(SYMBOLS_MAPPING) \

    $(PROGUARD_DICT_ZIP) \

core/product.mk

+0 −6
Original line number Diff line number Diff line
@@ -298,12 +298,6 @@ _product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST 
# installed on /system directory by default.

_product_list_vars += PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION



# When this is true, dynamic partitions is retrofitted on a device that has

# already been launched without dynamic partitions. Otherwise, the device

# is launched with dynamic partitions.

# This flag implies PRODUCT_USE_DYNAMIC_PARTITIONS.

_product_single_value_vars += PRODUCT_RETROFIT_DYNAMIC_PARTITIONS



# List of directories that will be used to gate blueprint modules from the build graph

_product_list_vars += PRODUCT_SOURCE_ROOT_DIRS

core/product_config.mk

+0 −4
Original line number Diff line number Diff line
@@ -495,10 +495,6 @@ ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT 
  endif

endif



ifndef PRODUCT_USE_DYNAMIC_PARTITIONS

  PRODUCT_USE_DYNAMIC_PARTITIONS := $(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS)

endif



# All requirements of PRODUCT_USE_DYNAMIC_PARTITIONS falls back to

# PRODUCT_USE_DYNAMIC_PARTITIONS if not defined.

ifndef PRODUCT_USE_DYNAMIC_PARTITION_SIZE