From 70baed35e1b4866916cbe8cc9f1800cd8bc668c7 Mon Sep 17 00:00:00 2001 From: Himanshu Agrawal Date: Mon, 16 Aug 2021 14:55:52 +0530 Subject: Optimize merge_target_files process to re-use images(2/2). Pick the images directly from the split target-files zips into the merged target-files instead of re-generating them again from blobs, to save time for non dynamic partiton builds as well. Change-Id: Id09e2f2332f73e9a21412160749affcc7e2f770f --- .../without_dynamic_partition/ab/merge_config_system_item_list | 1 + .../without_dynamic_partition/non_ab/merge_config_system_item_list | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list b/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list index 203b2e8..f898258 100644 --- a/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list +++ b/ota_merge_configs/without_dynamic_partition/ab/merge_config_system_item_list @@ -1,3 +1,4 @@ +IMAGES/system.img META/apexkeys.txt META/apkcerts.txt META/filesystem_config.txt diff --git a/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list b/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list index 203b2e8..9f921ec 100644 --- a/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list +++ b/ota_merge_configs/without_dynamic_partition/non_ab/merge_config_system_item_list @@ -1,3 +1,5 @@ +IMAGES/system.img +IMAGES/system.map META/apexkeys.txt META/apkcerts.txt META/filesystem_config.txt -- cgit v1.2.3