diff options
Diffstat (limited to 'scripts/update_device.py')
| -rwxr-xr-x | scripts/update_device.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/update_device.py b/scripts/update_device.py index 756d443f..354972b7 100755 --- a/scripts/update_device.py +++ b/scripts/update_device.py @@ -104,7 +104,7 @@ class AndroidOTAPackage(object): if payload_info.compress_type != 0: logging.error( - "Expected layload to be uncompressed, got compression method %d", + "Expected payload to be uncompressed, got compression method %d", payload_info.compress_type) # Don't use len(payload_info.extra). Because that returns size of extra # fields in central directory. We need to look at local file directory, @@ -125,10 +125,10 @@ class AndroidOTAPackage(object): payload_header = fp.read(4) if payload_header != self.PAYLOAD_MAGIC_HEADER: logging.warning( - "Invalid header, expeted %s, got %s." + "Invalid header, expected %s, got %s." "Either the offset is not correct, or payload is corrupted", binascii.hexlify(self.PAYLOAD_MAGIC_HEADER), - payload_header) + binascii.hexlify(payload_header)) property_entry = (self.SECONDARY_OTA_PAYLOAD_PROPERTIES_TXT if secondary_payload else self.OTA_PAYLOAD_PROPERTIES_TXT) @@ -403,6 +403,8 @@ def main(): help='Extra headers to pass to the device.') parser.add_argument('--secondary', action='store_true', help='Update with the secondary payload in the package.') + parser.add_argument('--no-slot-switch', action='store_true', + help='Do not perform slot switch after the update.') args = parser.parse_args() logging.basicConfig( level=logging.WARNING if args.no_verbose else logging.INFO) @@ -420,6 +422,9 @@ def main(): help_cmd = ['shell', 'su', '0', 'update_engine_client', '--help'] use_omaha = 'omaha' in dut.adb_output(help_cmd) + if args.no_slot_switch: + args.extra_headers += "\nSWITCH_SLOT_ON_REBOOT=0" + if args.file: # Update via pushing a file to /data. device_ota_file = os.path.join(OTA_PACKAGE_PATH, 'debug.zip') |