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

Commit 69c7308f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only enable zucchini if configuration file exists" am: 7b53ae67 am: 73590ef0 

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



Change-Id: I509cf3d7af4ef52adbf1d83bc3fbb66a8ebdb66c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ecc35225 73590ef0

tools/releasetools/ota_from_target_files.py

+2 −0
Original line number Diff line number Diff line
@@ -1208,6 +1208,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
        metadata.postcondition.partition_state)



  if not ota_utils.IsZucchiniCompatible(source_file, target_file):

    logger.warning(

        "Builds doesn't support zucchini, or source/target don't have compatible zucchini versions. Disabling zucchini.")

    OPTIONS.enable_zucchini = False



  additional_args += ["--enable_zucchini",

tools/releasetools/ota_utils.py

+4 −3
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ def IsZucchiniCompatible(source_file: str, target_file: str): 
      if os.path.exists(entry_path):

        with open(entry_path, "r") as fp:

          return fp.read()

      else:

        return ""

  return ReadEntry(source_file, _ZUCCHINI_CONFIG_ENTRY_NAME) == ReadEntry(target_file, _ZUCCHINI_CONFIG_ENTRY_NAME)
 
    return False

  sourceEntry = ReadEntry(source_file, _ZUCCHINI_CONFIG_ENTRY_NAME)

  targetEntry = ReadEntry(target_file, _ZUCCHINI_CONFIG_ENTRY_NAME)

  return sourceEntry and targetEntry and sourceEntry == targetEntry