openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Consider prebuilt vendor.img as having vendor partition." am: 8a7b0dee6b am: 4a5a1e15a1 

am: e45026effa

Change-Id: I50ed26b5bc532d37ddc3d30a915c183974ad34fa
This commit is contained in:
Tao Bao 2017-09-14 01:07:05 +00:00 committed by android-build-merger
parent def9b7708b e45026effa
commit 38a54546ea
1 changed files with 7 additions and 1 deletions
tools/releasetools
add_img_to_target_files.py

8
tools/releasetools/add_img_to_target_files.py
View File

@ -505,7 +505,13 @@ def AddImagesToTargetFiles(filename):
print("target_files appears to already contain images.")
sys.exit(1)
has_vendor = os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR"))
# vendor.img is unlike system.img or system_other.img. Because it could be
# built from source, or dropped into target_files.zip as a prebuilt blob. We
# consider either of them as vendor.img being available, which could be used
# when generating vbmeta.img for AVB.
has_vendor = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR")) or
os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
"vendor.img")))
has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
"SYSTEM_OTHER"))