Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8414a9e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow vendor_otatools arg to be file or folder" am: a2d6ed53

Original change: https://android-review.googlesource.com/c/platform/build/+/2007451

Change-Id: Ie7d1ac14913ad484f6c172605da60b9394fd479a
parents dc426cf2 a2d6ed53
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -1321,8 +1321,12 @@ def BuildVendorPartitions(output_zip_path):
    os.remove(os.path.join(vendor_tempdir, "META/pack_radioimages.txt"))

  # Build vendor images using vendor otatools.
  # 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",