Merge "Fix s to t OTA" am: 64bfc41359
am: c4e1d12853
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966 Change-Id: Ia20bdef8a788e1a4fbb8facf047c2bf211bd8495 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(
|
||||
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:
|
||||
minor_version = self.minor_version
|
||||
cmd.extend(["--major_version", str(major_version)])
|
||||
|
Reference in New Issue
Block a user