diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-04-09 18:53:02 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-04-09 18:53:02 -0700 |
| commit | 0b2e4e2760301769be42fbf9afcfe10a90c231af (patch) | |
| tree | 5aed9ee7ef8f6cf1a7e91a172ff90549cd45045f | |
| parent | ffa08864577893bc2aeee277fb97b2488c9c45d8 (diff) | |
| parent | 38d8f424569d2d0d5fd80d31fbf49e4c6a15185a (diff) | |
Merge 38d8f424569d2d0d5fd80d31fbf49e4c6a15185a on remote branch
Change-Id: I82af13183a6e2c5e25e1079c7e0d3fadcc7eb8c3
| -rw-r--r-- | ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list | 5 | ||||
| -rw-r--r-- | ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list | 6 |
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 |