Add support for /odm partition
This CL is largely an adaptation of Change-Id
I5d229f6ac729ea6df9ff1f14cee2e28972cd9b4d
tools/vendor_buildinfo.sh is also renamed to tools/device_buildinfo.sh.
The caller then can invoke device_buildinfo.sh "vendor" | "odm" to
generate properties for vendor.img and odm.img, respectively.
It adds the following variables:
- BOARD_AVB_ODM_KEY_PATH
- BOARD_AVB_ODM_ALGORITHM
- BOARD_AVB_ODM_ROLLBACK_INDEX_LOCATION
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
- BOARD_ODMIMAGE_EXTFS_INODE_COUNT
- BOARD_ODMIMAGE_EXTFS_RSV_PCT
- BOARD_ODMIMAGE_PARTITION_SIZE
- BOARD_ODMIMAGE_JOURNAL_SIZE
- BOARD_ODMIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR
- BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_ODMIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_PREBUILT_ODMIMAGE
- BOARD_USES_ODMIMAGE
- LOCAL_ODM_MODULE
- PRODUCT_ODM_BASE_FS_PATH
- PRODUCT_ODM_VERITY_PARTITION
- PRODUCT_ODM_PROPERTIES
- TARGET_COPY_OUT_ODM
- TARGET_OUT_ODM
- TARGET_OUT_ODM_*
Bug: 64195575
Test: boot a Taimen with existing images
Test: `make odmimage` with
- BOARD_AVB_ENABLE := true
- BOARD_ODMIMAGE_PARTITION_SIZE := 62914560
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
- TARGET_COPY_OUT_ODM := odm
- PRODUCT_ODM_PROPERTIES += odm.test.build=success
Test: `make odmimage` with
- BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE := 10485760
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
- BOARD_AVB_ENABLE := true
- TARGET_COPY_OUT_ODM := odm
- PRODUCT_ODM_PROPERTIES += odm.test.build=success
- PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
Change-Id: I4dea7b567ec49a766c7a4683decaf81c7e921d55
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 5b46ab0..86ba1a6 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -931,6 +931,26 @@
if not copy_prop("product_services_extfs_rsv_pct", "extfs_rsv_pct"):
d["extfs_rsv_pct"] = "0"
copy_prop("product_services_reserved_size", "partition_reserved_size")
+ elif mount_point == "odm":
+ copy_prop("avb_odm_hashtree_enable", "avb_hashtree_enable")
+ copy_prop("avb_odm_add_hashtree_footer_args",
+ "avb_add_hashtree_footer_args")
+ copy_prop("avb_odm_key_path", "avb_key_path")
+ copy_prop("avb_odm_algorithm", "avb_algorithm")
+ copy_prop("odm_fs_type", "fs_type")
+ copy_prop("odm_size", "partition_size")
+ if not copy_prop("odm_journal_size", "journal_size"):
+ d["journal_size"] = "0"
+ copy_prop("odm_verity_block_device", "verity_block_device")
+ copy_prop("odm_squashfs_compressor", "squashfs_compressor")
+ copy_prop("odm_squashfs_compressor_opt", "squashfs_compressor_opt")
+ copy_prop("odm_squashfs_block_size", "squashfs_block_size")
+ copy_prop("odm_squashfs_disable_4k_align", "squashfs_disable_4k_align")
+ copy_prop("odm_base_fs_file", "base_fs_file")
+ copy_prop("odm_extfs_inode_count", "extfs_inode_count")
+ if not copy_prop("odm_extfs_rsv_pct", "extfs_rsv_pct"):
+ d["extfs_rsv_pct"] = "0"
+ copy_prop("odm_reserved_size", "partition_reserved_size")
elif mount_point == "oem":
copy_prop("fs_type", "fs_type")
copy_prop("oem_size", "partition_size")
@@ -976,6 +996,8 @@
copy_prop(size_property, "system_size")
elif mount_point == "vendor":
copy_prop(size_property, "vendor_size")
+ elif mount_point == "odm":
+ copy_prop(size_property, "odm_size")
elif mount_point == "product":
copy_prop(size_property, "product_size")
elif mount_point == "product-services":
@@ -1017,6 +1039,8 @@
mount_point = "cache"
elif image_filename == "vendor.img":
mount_point = "vendor"
+ elif image_filename == "odm.img":
+ mount_point = "odm"
elif image_filename == "oem.img":
mount_point = "oem"
elif image_filename == "product.img":