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

Commit 1efb8a7a authored by Alex Light's avatar Alex Light Committed by Gerrit Code Review
Browse files

Merge "Revert "Build image for clean super partition.""

parents c296e5ee 989b3ad8

core/Makefile

+4 −17
Original line number Diff line number Diff line
@@ -2637,20 +2637,19 @@ ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION)) 
ifdef BOARD_SUPER_PARTITION_SIZE



INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img

INSTALLED_SUPERIMAGE_EMPTY_TARGET := $(PRODUCT_OUT)/super_empty.img



$(INSTALLED_SUPERIMAGE_TARGET): $(call image-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))



# For A/B devices, super partition always contains sub-partitions in the _a slot, because this

# image should only be used for bootstrapping / initializing the device. When flashing the image,

# bootloader fastboot should always mark _a slot as bootable.

ifeq ($(AB_OTA_UPDATER),true)

$(INSTALLED_SUPERIMAGE_TARGET) $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): PRIVATE_PARTITION_SUFFIX=_a

$(INSTALLED_SUPERIMAGE_TARGET) $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): PRIVATE_METADATA_SLOTS=2

$(INSTALLED_SUPERIMAGE_TARGET): PRIVATE_PARTITION_SUFFIX=_a

$(INSTALLED_SUPERIMAGE_TARGET): PRIVATE_METADATA_SLOTS=2

else

$(INSTALLED_SUPERIMAGE_TARGET) $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): PRIVATE_METADATA_SLOTS=1

$(INSTALLED_SUPERIMAGE_TARGET): PRIVATE_METADATA_SLOTS=1

endif # AB_OTA_UPDATER





$(INSTALLED_SUPERIMAGE_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake

	$< \

		--sparse \
@@ -2664,18 +2663,6 @@ $(INSTALLED_SUPERIMAGE_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake 


$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_TARGET))



$(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake

	$< \

		--sparse \

		--metadata-size 65536 \

		--metadata-slots $(PRIVATE_METADATA_SLOTS) \

		--device-size $(BOARD_SUPER_PARTITION_SIZE) \

		--output $@ \

		$(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

			--partition $(name)$(PRIVATE_PARTITION_SUFFIX):$$($(UUIDGEN) $(name)$(PRIVATE_SUPER_PARTITION_SUFFIX)):readonly:$(call read-size-of-partitions,$(name)))



$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))



endif # BOARD_SUPER_PARTITION_SIZE

endif # PRODUCT_BUILD_SUPER_PARTITION

core/main.mk

+0 −4
Original line number Diff line number Diff line
@@ -1208,9 +1208,6 @@ systemotherimage: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) 
.PHONY: superimage

superimage: $(INSTALLED_SUPERIMAGE_TARGET)



.PHONY: superimage_empty

superimage_empty: $(INSTALLED_SUPERIMAGE_EMPTY_TARGET)



.PHONY: bootimage

bootimage: $(INSTALLED_BOOTIMAGE_TARGET)
@@ -1231,7 +1228,6 @@ droidcore: files \ 
    $(INSTALLED_CACHEIMAGE_TARGET) \

    $(INSTALLED_BPTIMAGE_TARGET) \

    $(INSTALLED_VENDORIMAGE_TARGET) \

    $(INSTALLED_SUPERIMAGE_EMPTY_TARGET) \

    $(INSTALLED_PRODUCTIMAGE_TARGET) \

    $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) \

    $(INSTALLED_FILES_FILE) \