From 560569a617c86be7985bd699e20fd19c6b2715c8 Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Thu, 18 Sep 2014 15:12:45 -0700 Subject: [PATCH] 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 --- tools/releasetools/ota_from_target_files | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 6f344504b5..e8dff5af91 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -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")