summaryrefslogtreecommitdiff
path: root/tools/releasetools/merge/merge_utils.py
diff options
context:
space:
mode:
author Kelvin Zhang <zhangkelvin@google.com> 2022-11-09 10:59:25 -0800
committer Kelvin Zhang <zhangkelvin@google.com> 2022-11-09 14:43:17 -0800
commitfa40c04cba0522bfc781f4e8e15673f9ccff097a (patch)
treebc373ce45ca5621f100915e332e31aaf9a568da5 /tools/releasetools/merge/merge_utils.py
parenta56bce6ef1f41c906c7f65a725a8accaf05b87a3 (diff)
Fix recovery OTA error on merged targets
Currently, when merging target files, system side's update_engine version info is copied into the merged target_files. This causes recovery OTA failure, because update_engine_sideload daemon in recovery is from vendor side. To fix it, use the older version of update_engine config when merging target files. Test: th Bug: 257426678 Change-Id: I5d3304366749995c99a61ca0645a22ee047f1465
Diffstat (limited to 'tools/releasetools/merge/merge_utils.py')
-rw-r--r--tools/releasetools/merge/merge_utils.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/releasetools/merge/merge_utils.py b/tools/releasetools/merge/merge_utils.py
index e253b02545..e056195733 100644
--- a/tools/releasetools/merge/merge_utils.py
+++ b/tools/releasetools/merge/merge_utils.py
@@ -178,7 +178,6 @@ def InferItemList(input_namelist, framework):
item_set.update([
'META/liblz4.so',
'META/postinstall_config.txt',
- 'META/update_engine_config.txt',
'META/zucchini_config.txt',
])
else: # vendor