commit e9cef4a7f36c12f7a25440449a1313ed6a7e0db3
author Kelvin Zhang <zhangkelvin@google.com> Tue Sep 28 22:24:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 28 22:24:23 2021 +0000
tree e3a05182f46e3b491de931915f70eec9034a780e
parent 35101114e681174c3643232307726364f82a4cf8
parent a556f049f6b334710727d3d06886e8a986509839

Make simulate_ota support images in RADIO/ dir am: 5ebe29607c am: b158d13797 am: a556f049f6

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1838613

Change-Id: Ifa5fafbf5cbc61994844c31c651791286c4e0dae

scripts/simulate_ota.py

diff --git a/scripts/simulate_ota.py b/scripts/simulate_ota.py
index e508f50..40f463f 100644
--- a/scripts/simulate_ota.py
+++ b/scripts/simulate_ota.py
@@ -49,9 +49,13 @@
     return fp.read(4) == b'\x3A\xFF\x26\xED'
 
 
-def extract_img(zip_archive, img_name, output_path):
+def extract_img(zip_archive: zipfile.ZipFile, img_name, output_path):
   entry_name = "IMAGES/" + img_name + ".img"
-  extract_file(zip_archive, entry_name, output_path)
+  try:
+    extract_file(zip_archive, entry_name, output_path)
+  except (KeyError, FileNotFoundError) as e:
+    print("Faild to extract", img_name, "from IMAGES/ dir, trying RADIO/", e)
+    extract_file(zip_archive, "RADIO/" + img_name + ".img", output_path)
   if is_sparse_image(output_path):
     raw_img_path = output_path + ".raw"
     subprocess.check_output(["simg2img", output_path, raw_img_path])
@@ -99,7 +103,7 @@
   partition_names = [
       part.partition_name for part in payload.manifest.partitions
   ]
-  if (payload.manifest.partial_update):
+  if payload.manifest.partial_update:
     delta_generator_args.append("--is_partial_update")
   if payload.is_incremental:
     delta_generator_args.append("--old_partitions=" + ":".join(old_partitions))