aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-08-31 21:23:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-08-31 21:23:40 +0000
commitbdf9be4708f75624fccc26495346c030ccaa0576 (patch)
treeaff231729d1ad76b0123f8e4c7d6b322c2f6c8a0
parentfe93495fb3728e054d13311bf265e5fc0887f620 (diff)
parent1250bcab0a60108a4baa804c82cef1887b5203d9 (diff)
downloadbuild-bdf9be4708f75624fccc26495346c030ccaa0576.tar.gz
Merge "Allow user to manually override enable_vabc_xor"
-rwxr-xr-xtools/releasetools/ota_from_target_files.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 38af0d4ee3..40da34d122 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -221,6 +221,10 @@ A/B OTA specific options
For VABC downgrades, we must finish merging before doing data wipe, and
since data wipe is required for downgrading OTA, this might cause long
wait time in recovery.
+
+ --enable_vabc_xor
+ Enable the VABC xor feature. Will reduce space requirements for OTA
+
"""
from __future__ import print_function
@@ -286,7 +290,7 @@ OPTIONS.custom_images = {}
OPTIONS.disable_vabc = False
OPTIONS.spl_downgrade = False
OPTIONS.vabc_downgrade = False
-OPTIONS.enable_vabc_xor = False
+OPTIONS.enable_vabc_xor = True
POSTINSTALL_CONFIG = 'META/postinstall_config.txt'
DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt'
@@ -1312,7 +1316,7 @@ def main(argv):
elif o == "--vabc_downgrade":
OPTIONS.vabc_downgrade = True
elif o == "--enable_vabc_xor":
- OPTIONS.enable_vabc_xor = True
+ OPTIONS.enable_vabc_xor = a.lower() != "false"
else:
return False
return True
@@ -1357,7 +1361,7 @@ def main(argv):
"disable_vabc",
"spl_downgrade",
"vabc_downgrade",
- "enable_vabc_xor",
+ "enable_vabc_xor=",
], extra_option_handler=option_handler)
if len(args) != 2: