StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 11d4406e: am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."

Browse Source 
* commit '11d4406eb9796819baeafda3142b16f9cc63d532':
  Fix OTA scripts to generate incremental BBOTA with OEM property.
This commit is contained in:
Tao Bao
2015-07-06 16:49:06 +00:00
committed by Android Git Automerger
parent 2a50b9b006 11d4406eb9
commit 9b1a9ec53f
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/releasetools/ota_from_target_files.py
View File

@@ -722,6 +722,8 @@ def AddToKnownPaths(filename, known_paths):
def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
# TODO(tbao): We should factor out the common parts between
# WriteBlockIncrementalOTAPackage() and WriteIncrementalOTAPackage().
source_version = OPTIONS.source_info_dict["recovery_api_version"] source_version = OPTIONS.source_info_dict["recovery_api_version"]
target_version = OPTIONS.target_info_dict["recovery_api_version"] target_version = OPTIONS.target_info_dict["recovery_api_version"]
@@ -732,9 +734,20 @@ 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"])
oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")
recovery_mount_options = OPTIONS.source_info_dict.get(
"recovery_mount_options")
oem_dict = 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", recovery_mount_options)
oem_dict = common.LoadDictionaryFromLines(
open(OPTIONS.oem_source).readlines())
metadata = { metadata = {
"pre-device": GetBuildProp("ro.product.device", "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
OPTIONS.source_info_dict), OPTIONS.source_info_dict),
"post-timestamp": GetBuildProp("ro.build.date.utc", "post-timestamp": GetBuildProp("ro.build.date.utc",
OPTIONS.target_info_dict), OPTIONS.target_info_dict),
} }
@@ -749,14 +762,10 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
metadata=metadata, metadata=metadata,
info_dict=OPTIONS.info_dict) info_dict=OPTIONS.info_dict)
# TODO: Currently this works differently from WriteIncrementalOTAPackage(). source_fp = CalculateFingerprint(oem_props, oem_dict,
# This function doesn't consider thumbprints when writing OPTIONS.source_info_dict)
# metadata["pre/post-build"]. One possible reason is that the current target_fp = CalculateFingerprint(oem_props, oem_dict,
# devices with thumbprints are all using file-based OTAs. Long term we OPTIONS.target_info_dict)
# should factor out the common parts into a shared one to avoid further
# divergence.
source_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.source_info_dict)
target_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.target_info_dict)
metadata["pre-build"] = source_fp metadata["pre-build"] = source_fp
metadata["post-build"] = target_fp metadata["post-build"] = target_fp
@@ -795,17 +804,6 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
else: else:
vendor_diff = None vendor_diff = None
oem_props = OPTIONS.target_info_dict.get("oem_fingerprint_properties")
recovery_mount_options = OPTIONS.source_info_dict.get(
"recovery_mount_options")
oem_dict = 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", recovery_mount_options)
oem_dict = common.LoadDictionaryFromLines(
open(OPTIONS.oem_source).readlines())
AppendAssertions(script, OPTIONS.target_info_dict, oem_dict) AppendAssertions(script, OPTIONS.target_info_dict, oem_dict)
device_specific.IncrementalOTA_Assertions() device_specific.IncrementalOTA_Assertions()