Support /product partition
This CL adds the following build flags to support building product partition from Android build system. - BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS - BOARD_AVB_PRODUCT_KEY_PATH - BOARD_AVB_PRODUCT_ALGORITHM - BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION - BOARD_PREBUILT_PRODUCTIMAGE - BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT - BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE - BOARD_PRODUCTIMAGE_PARTITION_SIZE - BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE - BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR - BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT - BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN - BOARD_USES_PRODUCTIMAGE - LOCAL_PRODUCT_MODULE - PRODUCT_FOOTER_ARGS - PRODUCT_PRODUCT_BASE_FS_PATH - PRODUCT_PRODUCT_VERITY_PARTITION - TARGET_COPY_OUT_PRODUCT - TARGET_OUT_PRODUCT* And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific properties in /product/build.prop. Bug: 64195575 Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE, BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION. Change-Id: I774e6a38003734421591e51bed103802ff84f432
This commit is contained in:
@@ -778,6 +778,22 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
|
||||
copy_prop("vendor_squashfs_disable_4k_align", "squashfs_disable_4k_align")
|
||||
copy_prop("vendor_base_fs_file", "base_fs_file")
|
||||
copy_prop("vendor_extfs_inode_count", "extfs_inode_count")
|
||||
elif mount_point == "product":
|
||||
copy_prop("avb_product_hashtree_enable", "avb_hashtree_enable")
|
||||
copy_prop("avb_product_add_hashtree_footer_args",
|
||||
"avb_add_hashtree_footer_args")
|
||||
copy_prop("avb_product_key_path", "avb_key_path")
|
||||
copy_prop("avb_product_algorithm", "avb_algorithm")
|
||||
copy_prop("product_fs_type", "fs_type")
|
||||
copy_prop("product_size", "partition_size")
|
||||
copy_prop("product_journal_size", "journal_size")
|
||||
copy_prop("product_verity_block_device", "verity_block_device")
|
||||
copy_prop("product_squashfs_compressor", "squashfs_compressor")
|
||||
copy_prop("product_squashfs_compressor_opt", "squashfs_compressor_opt")
|
||||
copy_prop("product_squashfs_block_size", "squashfs_block_size")
|
||||
copy_prop("product_squashfs_disable_4k_align", "squashfs_disable_4k_align")
|
||||
copy_prop("product_base_fs_file", "base_fs_file")
|
||||
copy_prop("product_extfs_inode_count", "extfs_inode_count")
|
||||
elif mount_point == "oem":
|
||||
copy_prop("fs_type", "fs_type")
|
||||
copy_prop("oem_size", "partition_size")
|
||||
@@ -831,6 +847,8 @@ def main(argv):
|
||||
mount_point = "vendor"
|
||||
elif image_filename == "oem.img":
|
||||
mount_point = "oem"
|
||||
elif image_filename == "product.img":
|
||||
mount_point = "product"
|
||||
else:
|
||||
print("error: unknown image file name ", image_filename, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
Reference in New Issue
Block a user