Use the update-binary in the source build for downgrade OTAs. am: fa41fb2705
am: 7302eb7dd6
* commit '7302eb7dd6bd22c6123bd0b252889732e215592e':
Use the update-binary in the source build for downgrade OTAs.
This commit is contained in:
@@ -75,7 +75,8 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
|
|||||||
build to an older one (based on timestamp comparison). "post-timestamp"
|
build to an older one (based on timestamp comparison). "post-timestamp"
|
||||||
will be replaced by "ota-downgrade=yes" in the metadata file. A data
|
will be replaced by "ota-downgrade=yes" in the metadata file. A data
|
||||||
wipe will always be enforced, so "ota-wipe=yes" will also be included in
|
wipe will always be enforced, so "ota-wipe=yes" will also be included in
|
||||||
the metadata file.
|
the metadata file. The update-binary in the source build will be used in
|
||||||
|
the OTA package, unless --binary flag is specified.
|
||||||
|
|
||||||
-e (--extra_script) <file>
|
-e (--extra_script) <file>
|
||||||
Insert the contents of file at the end of the update script.
|
Insert the contents of file at the end of the update script.
|
||||||
@@ -1017,6 +1018,11 @@ endif;
|
|||||||
""" % bcb_dev)
|
""" % bcb_dev)
|
||||||
|
|
||||||
script.SetProgress(1)
|
script.SetProgress(1)
|
||||||
|
# For downgrade OTAs, we prefer to use the update-binary in the source
|
||||||
|
# build that is actually newer than the one in the target build.
|
||||||
|
if OPTIONS.downgrade:
|
||||||
|
script.AddToZip(source_zip, output_zip, input_path=OPTIONS.updater_binary)
|
||||||
|
else:
|
||||||
script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)
|
script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)
|
||||||
WriteMetadata(metadata, output_zip)
|
WriteMetadata(metadata, output_zip)
|
||||||
|
|
||||||
@@ -1553,6 +1559,12 @@ endif;
|
|||||||
script.Unmount("/vendor")
|
script.Unmount("/vendor")
|
||||||
script.Mount("/vendor")
|
script.Mount("/vendor")
|
||||||
vendor_diff.EmitExplicitTargetVerification(script)
|
vendor_diff.EmitExplicitTargetVerification(script)
|
||||||
|
|
||||||
|
# For downgrade OTAs, we prefer to use the update-binary in the source
|
||||||
|
# build that is actually newer than the one in the target build.
|
||||||
|
if OPTIONS.downgrade:
|
||||||
|
script.AddToZip(source_zip, output_zip, input_path=OPTIONS.updater_binary)
|
||||||
|
else:
|
||||||
script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)
|
script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)
|
||||||
|
|
||||||
WriteMetadata(metadata, output_zip)
|
WriteMetadata(metadata, output_zip)
|
||||||
|
Reference in New Issue
Block a user