commit a2d6ed53f01f1d026d659e274934fa3cf03f128b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 04 23:08:21 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 23:08:21 2022 +0000
tree 5e9edd976a0cf2eb2d268e7b009d78efbd5cb1fb
parent 1421f7c7c3071abf38085399d1a453fc9afa2775
parent 63cde0fd9274cf8c9c40940e3b0babc012bbfdf1

Merge "Allow vendor_otatools arg to be file or folder"

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 054315f..a24fbdd 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1321,8 +1321,12 @@
     os.remove(os.path.join(vendor_tempdir, "META/pack_radioimages.txt"))
 
   # Build vendor images using vendor otatools.
-  vendor_otatools_dir = common.MakeTempDir(prefix="vendor_otatools_")
-  common.UnzipToDir(OPTIONS.vendor_otatools, vendor_otatools_dir)
+  # Accept either a zip file or extracted directory.
+  if os.path.isfile(OPTIONS.vendor_otatools):
+    vendor_otatools_dir = common.MakeTempDir(prefix="vendor_otatools_")
+    common.UnzipToDir(OPTIONS.vendor_otatools, vendor_otatools_dir)
+  else:
+    vendor_otatools_dir = OPTIONS.vendor_otatools
   cmd = [
       os.path.join(vendor_otatools_dir, "bin", "add_img_to_target_files"),
       "--is_signing",