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

Merge "releasetools: Fix two minor issues with _LoadOemDicts()." am: 0c9e8d87c4

Browse source 
am: cedbcb634f

Change-Id: Id80b3161d864392b249eb3d01ebbd28be16a8e61
This commit is contained in:
Tao Bao 2017-03-07 02:43:37 +00:00 committed by android-build-merger
commit e319d34b21
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/releasetools/ota_from_target_files.py
View file

@ -55,7 +55,6 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
properties on the OEM partition of the intended device.
Multiple expected values can be used by providing multiple files.
--oem_no_mount
For devices with OEM-specific properties but without an OEM partition,
do not mount the OEM partition in the updater-script. This should be
@ -482,12 +481,12 @@ def AppendAssertions(script, info_dict, oem_dicts=None):
script.AssertOemProperty(prop, values)
def _LoadOemDicts(script, recovery_mount_options):
def _LoadOemDicts(script, recovery_mount_options=None):
"""Returns the list of loaded OEM properties dict."""
oem_dicts = None
if OPTIONS.oem_source is None:
raise common.ExternalError("OEM source required for this build")
if not OPTIONS.oem_no_mount:
if not OPTIONS.oem_no_mount and script:
script.Mount("/oem", recovery_mount_options)
oem_dicts = []
for oem_file in OPTIONS.oem_source:
@ -1192,7 +1191,7 @@ def WriteVerifyPackage(input_zip, output_zip):
"recovery_mount_options")
oem_dicts = None
if oem_props:
oem_dicts = _LoadOemDicts(script, oem_props, recovery_mount_options)
oem_dicts = _LoadOemDicts(script, recovery_mount_options)
target_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
OPTIONS.info_dict)
@ -1337,7 +1336,7 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties", None)
oem_dicts = None
if oem_props:
oem_dicts = _LoadOemDicts(script, None)
oem_dicts = _LoadOemDicts(None)
metadata = {
"post-build": CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],