p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

If oem_fingerprint_props is empty, ignore. 

There may be cases where there is an OEM partition
but it has no effect on the OTA itself.  In these
cases, ignore an empty value from the misc_info.txt

Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
This commit is contained in:
Michael Runge 2014-09-18 15:12:45 -07:00
parent d036711427
commit 560569a617
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/ota_from_target_files
View File

@ -379,7 +379,7 @@ def SignOutput(temp_zip_name, output_zip_name):
def AppendAssertions(script, info_dict, oem_dict = None):
oem_props = info_dict.get("oem_fingerprint_properties")
if oem_props is None:
if oem_props is None or len(oem_props) == 0:
device = GetBuildProp("ro.product.device", info_dict)
script.AssertDevice(device)
else:
@ -463,7 +463,7 @@ def WriteFullOTAPackage(input_zip, output_zip):
oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
oem_dict = None
if oem_props is not None:
if oem_props is not None and len(oem_props) > 0:
if OPTIONS.oem_source is None:
raise common.ExternalError("OEM source required for this build")
script.Mount("/oem")
@ -746,7 +746,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
oem_props = OPTIONS.target_info_dict.get("oem_fingerprint_properties")
oem_dict = None
if oem_props is not None:
if oem_props is not None and len(oem_props) > 0:
if OPTIONS.oem_source is None:
raise common.ExternalError("OEM source required for this build")
script.Mount("/oem")
@ -1036,7 +1036,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
oem_dict = None
if oem_props is not None:
if oem_props is not None and len(oem_props) > 0:
if OPTIONS.oem_source is None:
raise common.ExternalError("OEM source required for this build")
script.Mount("/oem")