From 1930fd1f6761c042526eaeb32e42a07bf1c507a5 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 2 Nov 2023 19:13:35 +0900 Subject: [PATCH] Add --boot-image-dir-path arg The --boot-image-dir-path arg is added to use the boot.img in Android Common Kernel (ACK) when merging. Test: merge_target_files.py with --boot-image-dir-path and without --boot-image-dir-path Bug: 309745179 Change-Id: Ia164a9fc7e4761ad7efb871c0b6054195e9e4bda --- tools/releasetools/merge/merge_target_files.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/releasetools/merge/merge_target_files.py b/tools/releasetools/merge/merge_target_files.py index 6bf1b49031..46192464ab 100755 --- a/tools/releasetools/merge/merge_target_files.py +++ b/tools/releasetools/merge/merge_target_files.py @@ -46,6 +46,10 @@ Usage: merge_target_files [args] The optional path to a newline-separated config file of items that are extracted as-is from the vendor target files package. + --boot-image-dir-path + The input boot image directory path. This path contains IMAGES/boot.img + file. + --output-target-files output-target-files-package If provided, the output merged target files package. Also a zip archive. @@ -136,6 +140,7 @@ OPTIONS.framework_item_list = [] OPTIONS.framework_misc_info_keys = [] OPTIONS.vendor_target_files = None OPTIONS.vendor_item_list = [] +OPTIONS.boot_image_dir_path = None OPTIONS.output_target_files = None OPTIONS.output_dir = None OPTIONS.output_item_list = [] @@ -210,6 +215,12 @@ def create_merged_package(temp_dir): output_dir=output_target_files_temp_dir, item_list=OPTIONS.vendor_item_list) + if OPTIONS.boot_image_dir_path: + merge_utils.CollectTargetFiles( + input_zipfile_or_dir=OPTIONS.boot_image_dir_path, + output_dir=output_target_files_temp_dir, + item_list=['IMAGES/boot.img']) + # Perform special case processing on META/* items. # After this function completes successfully, all the files we need to create # the output target files package are in place. @@ -539,6 +550,8 @@ def main(): OPTIONS.vendor_item_list = a elif o == '--vendor-item-list': OPTIONS.vendor_item_list = a + elif o == '--boot-image-dir-path': + OPTIONS.boot_image_dir_path = a elif o == '--output-target-files': OPTIONS.output_target_files = a elif o == '--output-dir': @@ -587,6 +600,7 @@ def main(): 'vendor-target-files=', 'other-item-list=', 'vendor-item-list=', + 'boot-image-dir-path=', 'output-target-files=', 'output-dir=', 'output-item-list=',