summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArvind Kumar <karvin@codeaurora.org>2021-03-22 17:26:04 +0530
committerArvind Kumar <karvin@codeaurora.org>2021-03-31 09:49:19 +0530
commit38d8f424569d2d0d5fd80d31fbf49e4c6a15185a (patch)
tree5aed9ee7ef8f6cf1a7e91a172ff90549cd45045f
parentcda6dd8a5bcd9047424603f5b90b22ca4649e040 (diff)
Optimize merge_target_files process to re-use images.
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. Change-Id: Ic672a131e7ebdf4c2e477035028d476b9a153420
-rw-r--r--ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list5
-rw-r--r--ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list6
2 files changed, 11 insertions, 0 deletions
diff --git a/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list b/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list
index 2cf96ce..d67f070 100644
--- a/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list
+++ b/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list
@@ -1,3 +1,8 @@
+IMAGES/cache.img
+IMAGES/vendor.img
+IMAGES/vendor.map
+IMAGES/odm.img
+IMAGES/odm.map
META/boot_filesystem_config.txt
META/file_contexts.bin
META/otakeys.txt
diff --git a/ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list b/ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list
index 4f26b6a..8383307 100644
--- a/ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list
+++ b/ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list
@@ -1,3 +1,9 @@
+IMAGES/system.img
+IMAGES/system.map
+IMAGES/system_ext.img
+IMAGES/system_ext.map
+IMAGES/product.img
+IMAGES/product.map
META/apexkeys.txt
META/apkcerts.txt
META/filesystem_config.txt