Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 858e08e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix s to t OTA" am: 64bfc413 am: c4e1d128 

Original change: https://android-review.googlesource.com/c/platform/build/+/2531966



Change-Id: Ia20bdef8a788e1a4fbb8facf047c2bf211bd8495
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bf7d62a c4e1d128

tools/releasetools/ota_utils.py

+3 −0
Original line number Diff line number Diff line
@@ -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)])