Merge "Fix s to t OTA" am: 64bfc41359
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966 Change-Id: Ie38f034e6ced581e75df4069cc209801a987dd51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -839,6 +839,9 @@ class PayloadGenerator(object):
|
|||||||
|
|
||||||
major_version, minor_version = ParseUpdateEngineConfig(
|
major_version, minor_version = ParseUpdateEngineConfig(
|
||||||
os.path.join(target_dir, "META", "update_engine_config.txt"))
|
os.path.join(target_dir, "META", "update_engine_config.txt"))
|
||||||
|
if source_file:
|
||||||
|
major_version, minor_version = ParseUpdateEngineConfig(
|
||||||
|
os.path.join(source_dir, "META", "update_engine_config.txt"))
|
||||||
if self.minor_version:
|
if self.minor_version:
|
||||||
minor_version = self.minor_version
|
minor_version = self.minor_version
|
||||||
cmd.extend(["--major_version", str(major_version)])
|
cmd.extend(["--major_version", str(major_version)])
|
||||||
|
Reference in New Issue
Block a user