Merge "Adding option to disable fastboot_info" (ecf635f5) · Commits · e / os / android_build

tools/releasetools/img_from_target_files.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -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: