tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Adding option to disable fastboot_info" am: ecf635f507 am: 8f26a9ca1d am: b083f09783 am: b2989fc109 am: 2f4491756e am: 555a224b98

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

Change-Id: Ib53c1f41e977fea4ddf648af5ee54fd68e7263f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-03 06:27:32 +00:00 committed by Automerger Merge Worker
commit 93aea9b493
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/releasetools/img_from_target_files.py
View file

@ -64,7 +64,7 @@ OPTIONS.super_device_list = None
OPTIONS.retrofit_dap = None OPTIONS.retrofit_dap = None
OPTIONS.build_super = None OPTIONS.build_super = None
OPTIONS.sparse_userimages = None OPTIONS.sparse_userimages = None
OPTIONS.use_fastboot_info = False
def LoadOptions(input_file): def LoadOptions(input_file):
"""Loads information from input_file to OPTIONS. """Loads information from input_file to OPTIONS.
@ -118,8 +118,9 @@ def EntriesForUserImages(input_file):
entries = [ entries = [
'OTA/android-info.txt:android-info.txt', '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: with zipfile.ZipFile(input_file) as input_zip:
namelist = input_zip.namelist() namelist = input_zip.namelist()
if 'PREBUILT_IMAGES/kernel_16k' in namelist: if 'PREBUILT_IMAGES/kernel_16k' in namelist: