Merge "Adding option to disable fastboot_info" am: ecf635f507
am: 8f26a9ca1d
Original change: https://android-review.googlesource.com/c/platform/build/+/2612133 Change-Id: I1084c32575c319b29333918c17234f2823c2442c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -64,7 +64,7 @@ OPTIONS.super_device_list = None
|
||||
OPTIONS.retrofit_dap = None
|
||||
OPTIONS.build_super = None
|
||||
OPTIONS.sparse_userimages = None
|
||||
|
||||
OPTIONS.use_fastboot_info = False
|
||||
|
||||
def LoadOptions(input_file):
|
||||
"""Loads information from input_file to OPTIONS.
|
||||
@@ -118,8 +118,9 @@ def EntriesForUserImages(input_file):
|
||||
|
||||
entries = [
|
||||
'OTA/android-info.txt:android-info.txt',
|
||||
'META/fastboot-info.txt:fastboot-info.txt',
|
||||
]
|
||||
if OPTIONS.use_fastboot_info:
|
||||
entries.append('META/fastboot-info.txt:fastboot-info.txt')
|
||||
with zipfile.ZipFile(input_file) as input_zip:
|
||||
namelist = input_zip.namelist()
|
||||
if 'PREBUILT_IMAGES/kernel_16k' in namelist:
|
||||
|
Reference in New Issue
Block a user