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

Commit 0bf940ca authored by Daniel Norman's avatar Daniel Norman
Browse files

Allows skipping building the super images for partial builds. 

Previously, setting PRODUCT_BUILD_SUPER_PARTITION to false for a partial
build (with PRODUCT_USE_DYNAMIC_PARTITIONS == true) would fail to
include necessary keys in misc_info.txt that are required when merging
two partial builds to create a dynamic-partition-enabled mixed build.

This change ensures these necessary keys are included even when
PRODUCT_BUILD_SUPER_PARTITION is false. Setting
PRODUCT_BUILD_SUPER_PARTITION to false causes partial builds to skip
building super.img and super_empty.img, instead relying on these images
to come from the final merged build.

Bug: 134764140
Test: Building & booting a dynamic-partition-enabled mixed build, and
inspecting partial builds' logs / out folder to ensure that
super.img/super_empty.img were not created.

Change-Id: I99431a9a342e9b0617510e250597f3024ef39322
parent f1e61651

core/config.mk

+4 −5
Original line number Diff line number Diff line
@@ -925,10 +925,6 @@ BOARD_SUPER_PARTITION_PARTITION_LIST := \ 
        $(BOARD_$(group)_PARTITION_LIST))

.KATI_READONLY := BOARD_SUPER_PARTITION_PARTITION_LIST



endif # PRODUCT_USE_DYNAMIC_PARTITIONS



ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true)



ifneq ($(BOARD_SUPER_PARTITION_SIZE),)

ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)
@@ -988,8 +984,11 @@ 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)), \
@@ -998,7 +997,7 @@ $(foreach device,$(call to-upper,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)), \ 
        $(error BOARD_SUPER_PARTITION_$(device)_DEVICE_SIZE must not be empty)) \

    $(eval .KATI_READONLY := BOARD_SUPER_PARTITION_$(device)_DEVICE_SIZE))



endif # PRODUCT_BUILD_SUPER_PARTITION

endif # PRODUCT_USE_DYNAMIC_PARTITIONS



# ###############################################################

# Set up final options.

tools/releasetools/merge_target_files.py

+4 −0
Original line number Diff line number Diff line
@@ -530,6 +530,10 @@ def process_misc_info_txt(framework_target_files_temp_dir, 
        list_prefix='super_',

        list_suffix='_partition_list')

    merged_dict.update(merged_dynamic_partitions_dict)

    # Ensure that add_img_to_target_files rebuilds super_empty.img. This flag

    # may have been set to false in the partial builds to prevent duplicate

    # building of super.img and super_empty.img.

    merged_dict['build_super_partition'] = 'true'



  # Replace <image>_selinux_fc values with framework or vendor file_contexts.bin

  # depending on which dictionary the key came from.