openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge changes from topic "resizable_ota" am: c247436e2f am: 49b55bb784 

am: bb829b260e

Change-Id: Ifaa8082039de96b87f8dfe9c5f4ae486d64b713b
This commit is contained in:
Yifan Hong 2018-08-24 16:18:57 -07:00 committed by android-build-merger
parent b5537b3f34 bb829b260e
commit f4620fd3c8
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/Makefile
View File

@ -2829,32 +2829,36 @@ $(INSTALLED_SUPERIMAGE_TARGET): $(call images-for-partitions,$(BOARD_SUPER_PARTI
# 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
else
$(INSTALLED_SUPERIMAGE_TARGET) $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): PRIVATE_METADATA_SLOTS=1
endif # AB_OTA_UPDATER
$(INSTALLED_SUPERIMAGE_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake
$< \
--sparse \
$(INSTALLED_SUPERIMAGE_TARGET) $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake
# $(1): output image path
# $(2): slot A suffix (_a or empty)
# $(3): include images or not (true or empty)
define build-superimage-target
$(HOST_OUT_EXECUTABLES)/lpmake \
$(if $(3), --sparse) \
--metadata-size 65536 \
--metadata-slots $(PRIVATE_METADATA_SLOTS) \
--metadata-slots $(if $(2),2,1) \
--device-size $(BOARD_SUPER_PARTITION_SIZE) \
--output $@ \
--output $(1) \
$(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \
--partition $(name)$(PRIVATE_PARTITION_SUFFIX):$$($(UUIDGEN) $(name)$(PRIVATE_PARTITION_SUFFIX)):readonly:$(call read-size-of-partitions,$(name)) \
--image $(name)$(PRIVATE_PARTITION_SUFFIX)=$(call images-for-partitions,$(name)))
--partition $(name)$(2):$$($(UUIDGEN) $(name)$(2)):readonly:$(if $(3),$(call read-size-of-partitions,$(name)),0) \
$(if $(3), --image $(name)$(2)=$(call images-for-partitions,$(name))) \
$(if $(2), --partition $(name)_b:$$($(UUIDGEN) $(name)_b):readonly:0) \
)
endef
$(INSTALLED_SUPERIMAGE_TARGET):
$(call pretty,"Target super fs image: $@")
$(call build-superimage-target,$@,$(PRIVATE_PARTITION_SUFFIX),true)
$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_TARGET))
$(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake
$< \
--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:0)
$(INSTALLED_SUPERIMAGE_EMPTY_TARGET):
$(call pretty,"Target empty super fs image: $@")
$(call build-superimage-target,$@,$(PRIVATE_PARTITION_SUFFIX))
$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))