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

Commit 06429d70 authored by Tao Bao's avatar Tao Bao Committed by Hridya Valsaraju
Browse files

Change the condition for building super_empty.img. 

This CL changes the condition for building super_empty.img from
PRODUCT_BUILD_SUPER_PARTITION to PRODUCT_USE_DYNAMIC_PARTITIONS, as a
follow-up to the change in [1].

With the CL in [1], it skips building super.img and super_empty.img both
when turning off PRODUCT_BUILD_SUPER_PARTITION. However, the latter
should be mandatory whenever dynamic partitions is enabled. Because
fastboot relies on this file to properly flash dynamic partitions. Plus,
the cost for building super_empty.img is much lower than the one for
super.img.

As part of the change, it'll write group info into target_files when
building with PRODUCT_BUILD_SUPER_PARTITION == false. It's the work for
target_files merging script to determine the values to be picked up. The
current logic in merge_target_files.py always uses the one from vendor
target_files. This CL adds a testcase to ensure the behavior.

[1] https://android-review.googlesource.com/c/platform/build/+/928756

Bug: 135752763
Test: `m dist` with a target that sets PRODUCT_BUILD_SUPER_PARTITION to
      false. Check the built artifacts contain super_empty.img. Verify
      that the build can be flashed properly.

Change-Id: I277f087eab45663a6c3b33333d16e9e576c1c25c
Merged-In: I277f087eab45663a6c3b33333d16e9e576c1c25c
(cherry picked from commit 48a2feb6)
parent ef212270

core/Makefile

+15 −9
Original line number Diff line number Diff line
@@ -4447,21 +4447,27 @@ $(PROGUARD_DICT_ZIP) : 


endif # TARGET_BUILD_APPS



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

# super partition image (dist)



ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION))



# BOARD_SUPER_PARTITION_SIZE must be defined to build super image.

ifneq ($(BOARD_SUPER_PARTITION_SIZE),)

ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))



# Dump variables used by build_super_image.py.

# Dump variables used by build_super_image.py (for building super.img and super_empty.img).

# $(1): output file

define dump-super-image-info

  $(call dump-dynamic-partitions-info,$(1))

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

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

endef



endif # PRODUCT_USE_DYNAMIC_PARTITIONS



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

# super partition image (dist)



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.
@@ -4541,7 +4547,7 @@ endif # PRODUCT_BUILD_SUPER_PARTITION == "true" 
# -----------------------------------------------------------------

# super empty image



ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION))

ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))

ifneq ($(BOARD_SUPER_PARTITION_SIZE),)



INSTALLED_SUPERIMAGE_EMPTY_TARGET := $(PRODUCT_OUT)/super_empty.img
@@ -4557,7 +4563,7 @@ $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(LPMAKE) $(BUILD_SUPER_IMAGE) 
$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))



endif # BOARD_SUPER_PARTITION_SIZE != ""

endif # PRODUCT_BUILD_SUPER_PARTITION == "true"

endif # PRODUCT_USE_DYNAMIC_PARTITIONS == "true"





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

core/config.mk

+2 −6
Original line number Diff line number Diff line
@@ -886,17 +886,13 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
#       Must not be empty.

#     - BOARD_{GROUP}_PARTITION_PARTITION_LIST: the list of partitions that belongs to this group.

#       If empty, no partitions belong to this group, and the sum of sizes is effectively 0.

$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \

    $(eval BOARD_$(group)_PARTITION_LIST ?=) \

    $(eval .KATI_READONLY := BOARD_$(group)_PARTITION_LIST) \

)

ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true)

$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \

    $(eval BOARD_$(group)_SIZE := $(strip $(BOARD_$(group)_SIZE))) \

    $(if $(BOARD_$(group)_SIZE),,$(error BOARD_$(group)_SIZE must not be empty)) \

    $(eval .KATI_READONLY := BOARD_$(group)_SIZE) \

    $(eval BOARD_$(group)_PARTITION_LIST ?=) \

    $(eval .KATI_READONLY := BOARD_$(group)_PARTITION_LIST) \

)

endif # PRODUCT_BUILD_SUPER_PARTITION



# BOARD_*_PARTITION_LIST: a list of the following tokens

valid_super_partition_list := system vendor product product_services odm

tools/releasetools/add_img_to_target_files.py

+2 −1
Original line number Diff line number Diff line
@@ -870,10 +870,11 @@ def AddImagesToTargetFiles(filename): 
    banner("vbmeta")

    AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions)



  if OPTIONS.info_dict.get("build_super_partition") == "true":

  if OPTIONS.info_dict.get("use_dynamic_partitions") == "true":

    banner("super_empty")

    AddSuperEmpty(output_zip)



  if OPTIONS.info_dict.get("build_super_partition") == "true":

    if OPTIONS.info_dict.get(

        "build_retrofit_dynamic_partitions_ota_package") == "true":

      banner("super split images")

tools/releasetools/merge_target_files.py

+3 −3
Original line number Diff line number Diff line
@@ -395,9 +395,9 @@ def process_misc_info_txt( 
      merged_info_dict[key] = '%s %s' % (

        system_info_dict.get(key, ''),

        merged_info_dict.get(key, ''))

    # 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.

    # Ensure that add_img_to_target_files rebuilds super split images for

    # devices that retrofit dynamic partitions. This flag may have been set to

    # false in the partial builds to prevent duplicate building of super.img.

    merged_dict['build_super_partition'] = 'true'



  output_misc_info_txt = os.path.join(