openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Fix the bug that skips loading OEM dict." 

am: 7889375102

Change-Id: If83ca048a4acdcdf079e3d6dd3b111181fbdc789
This commit is contained in:
Tao Bao 2017-12-21 17:51:48 +00:00 committed by android-build-merger
parent 1d979598f5 7889375102
commit 80fb79f200
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/ota_from_target_files.py
View File

@ -409,10 +409,10 @@ def WriteFullOTAPackage(input_zip, output_zip):
# in the target build. # in the target build.
script = edify_generator.EdifyGenerator(3, OPTIONS.info_dict) script = edify_generator.EdifyGenerator(3, OPTIONS.info_dict)
recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options")
oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties") oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
oem_dicts = None oem_dicts = None
if oem_props: if oem_props:
recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options")
oem_dicts = _LoadOemDicts(script, recovery_mount_options) oem_dicts = _LoadOemDicts(script, recovery_mount_options)
target_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0], target_fp = CalculateFingerprint(oem_props, oem_dicts and oem_dicts[0],
@ -503,8 +503,6 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
if HasVendorPartition(input_zip): if HasVendorPartition(input_zip):
system_progress -= 0.1 system_progress -= 0.1
recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options")
script.ShowProgress(system_progress, 0) script.ShowProgress(system_progress, 0)
# Full OTA is done as an "incremental" against an empty source image. This # Full OTA is done as an "incremental" against an empty source image. This
@ -632,12 +630,12 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
source_version, OPTIONS.target_info_dict, source_version, OPTIONS.target_info_dict,
fstab=OPTIONS.source_info_dict["fstab"]) fstab=OPTIONS.source_info_dict["fstab"])
recovery_mount_options = OPTIONS.source_info_dict.get(
"recovery_mount_options")
source_oem_props = OPTIONS.source_info_dict.get("oem_fingerprint_properties") source_oem_props = OPTIONS.source_info_dict.get("oem_fingerprint_properties")
target_oem_props = OPTIONS.target_info_dict.get("oem_fingerprint_properties") target_oem_props = OPTIONS.target_info_dict.get("oem_fingerprint_properties")
oem_dicts = None oem_dicts = None
if source_oem_props and target_oem_props: if source_oem_props or target_oem_props:
recovery_mount_options = OPTIONS.source_info_dict.get(
"recovery_mount_options")
oem_dicts = _LoadOemDicts(script, recovery_mount_options) oem_dicts = _LoadOemDicts(script, recovery_mount_options)
metadata = { metadata = {