StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie7d1ac14913ad484f6c172605da60b9394fd479a
This commit is contained in:
Treehugger Robot
2022-03-04 23:30:36 +00:00
committed by Automerger Merge Worker
parent dc426cf23b a2d6ed53f0
commit 8414a9e9c0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/sign_target_files_apks.py
View File

@@ -1321,8 +1321,12 @@ def BuildVendorPartitions(output_zip_path):
os.remove(os.path.join(vendor_tempdir, "META/pack_radioimages.txt")) os.remove(os.path.join(vendor_tempdir, "META/pack_radioimages.txt"))
# Build vendor images using vendor otatools. # 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_") vendor_otatools_dir = common.MakeTempDir(prefix="vendor_otatools_")
common.UnzipToDir(OPTIONS.vendor_otatools, vendor_otatools_dir) common.UnzipToDir(OPTIONS.vendor_otatools, vendor_otatools_dir)
else:
vendor_otatools_dir = OPTIONS.vendor_otatools
cmd = [ cmd = [
os.path.join(vendor_otatools_dir, "bin", "add_img_to_target_files"), os.path.join(vendor_otatools_dir, "bin", "add_img_to_target_files"),
"--is_signing", "--is_signing",