StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "revert-1644988-nextgen-release-img-zip-cleanup-KPBTKCTROS" am: 4b2242de5e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1653539

Change-Id: I37eb5237e21d37f049f848eff4c356c092be0d0d
This commit is contained in:
Tianjie Xu
2021-03-25 05:47:31 +00:00
committed by Automerger Merge Worker
parent dcacc47ac7 4b2242de5e
commit 402c4f9426
5 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/Makefile
View File

@@ -4621,8 +4621,6 @@ define dump-dynamic-partitions-info
echo "lpmake=$(notdir $(LPMAKE))" >> $(1) echo "lpmake=$(notdir $(LPMAKE))" >> $(1)
$(if $(filter true,$(PRODUCT_BUILD_SUPER_PARTITION)), $(if $(BOARD_SUPER_PARTITION_SIZE), \ $(if $(filter true,$(PRODUCT_BUILD_SUPER_PARTITION)), $(if $(BOARD_SUPER_PARTITION_SIZE), \
echo "build_super_partition=true" >> $(1))) 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)), \ $(if $(filter true,$(BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE)), \
echo "build_retrofit_dynamic_partitions_ota_package=true" >> $(1)) echo "build_retrofit_dynamic_partitions_ota_package=true" >> $(1))
echo "super_metadata_device=$(BOARD_SUPER_PARTITION_METADATA_DEVICE)" >> $(1) echo "super_metadata_device=$(BOARD_SUPER_PARTITION_METADATA_DEVICE)" >> $(1)
@@ -5492,7 +5490,9 @@ endif # PRODUCT_BUILD_SUPER_PARTITION == "true"
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# super empty image # super empty image
ifdef BUILDING_SUPER_EMPTY_IMAGE
ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
ifneq ($(BOARD_SUPER_PARTITION_SIZE),)
INSTALLED_SUPERIMAGE_EMPTY_TARGET := $(PRODUCT_OUT)/super_empty.img INSTALLED_SUPERIMAGE_EMPTY_TARGET := $(PRODUCT_OUT)/super_empty.img
$(INSTALLED_SUPERIMAGE_EMPTY_TARGET): intermediates := $(call intermediates-dir-for,PACKAGING,super_empty) $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): intermediates := $(call intermediates-dir-for,PACKAGING,super_empty)
@@ -5506,7 +5506,8 @@ $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(LPMAKE) $(BUILD_SUPER_IMAGE)
$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET)) $(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))
endif # BUILDING_SUPER_EMPTY_IMAGE endif # BOARD_SUPER_PARTITION_SIZE != ""
endif # PRODUCT_USE_DYNAMIC_PARTITIONS == "true"
# ----------------------------------------------------------------- # -----------------------------------------------------------------

19
core/board_config.mk
View File

@@ -460,25 +460,6 @@ ifeq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
endif endif
.KATI_READONLY := BUILDING_VBMETA_IMAGE .KATI_READONLY := BUILDING_VBMETA_IMAGE
# Are we building a super_empty image
BUILDING_SUPER_EMPTY_IMAGE :=
ifeq ($(PRODUCT_BUILD_SUPER_EMPTY_IMAGE),)
ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
ifneq ($(BOARD_SUPER_PARTITION_SIZE),)
BUILDING_SUPER_EMPTY_IMAGE := true
endif
endif
else ifeq ($(PRODUCT_BUILD_SUPER_EMPTY_IMAGE),true)
ifneq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
$(error PRODUCT_BUILD_SUPER_EMPTY_IMAGE set to true, but PRODUCT_USE_DYNAMIC_PARTITIONS is not true)
endif
ifeq ($(BOARD_SUPER_PARTITION_SIZE),)
$(error PRODUCT_BUILD_SUPER_EMPTY_IMAGE set to true, but BOARD_SUPER_PARTITION_SIZE is not defined)
endif
BUILDING_SUPER_EMPTY_IMAGE := true
endif
.KATI_READONLY := BUILDING_SUPER_EMPTY_IMAGE
########################################### ###########################################
# Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR # Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR
ifeq ($(TARGET_COPY_OUT_VENDOR),$(_vendor_path_placeholder)) ifeq ($(TARGET_COPY_OUT_VENDOR),$(_vendor_path_placeholder))

1
core/product.mk
View File

@@ -384,7 +384,6 @@ _product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE
_product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE _product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE
_product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE _product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE
_product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE _product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE
_product_single_value_vars += PRODUCT_BUILD_SUPER_EMPTY_IMAGE
# List of boot jars delivered via apex # List of boot jars delivered via apex
_product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS _product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS

1
target/product/gsi_release.mk
View File

@@ -65,4 +65,3 @@ PRODUCT_BUILD_CACHE_IMAGE := false
PRODUCT_BUILD_USERDATA_IMAGE := false PRODUCT_BUILD_USERDATA_IMAGE := false
PRODUCT_BUILD_VENDOR_IMAGE := false PRODUCT_BUILD_VENDOR_IMAGE := false
PRODUCT_BUILD_SUPER_PARTITION := false PRODUCT_BUILD_SUPER_PARTITION := false
PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false

5
tools/releasetools/add_img_to_target_files.py
View File

@@ -1027,9 +1027,8 @@ def AddImagesToTargetFiles(filename):
AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions) AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions)
if OPTIONS.info_dict.get("use_dynamic_partitions") == "true": if OPTIONS.info_dict.get("use_dynamic_partitions") == "true":
if OPTIONS.info_dict.get("build_super_empty_partition") == "true": banner("super_empty")
banner("super_empty") AddSuperEmpty(output_zip)
AddSuperEmpty(output_zip)
if OPTIONS.info_dict.get("build_super_partition") == "true": if OPTIONS.info_dict.get("build_super_partition") == "true":
if OPTIONS.info_dict.get( if OPTIONS.info_dict.get(