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

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

Merge "Prevent VABC from being disabled on release-key builds" into main am:... 

Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666 am: fc35a79c am: e1cc0740 am: aa666fac

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



Change-Id: Ibaf55aabb43424af10f44a3ddd267d4e7e389574
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 250dd551 aa666fac

tools/releasetools/common.py

+5 −0
Original line number Diff line number Diff line
@@ -449,6 +449,11 @@ class BuildInfo(object): 
    system_prop = self.info_dict.get("system.build.prop")

    return system_prop and system_prop.GetProp("ro.build.version.release") == "11"



  @property

  def is_release_key(self):

    system_prop = self.info_dict.get("build.prop")

    return system_prop and system_prop.GetProp("ro.build.tags") == "release-key"



  @property

  def vabc_compression_param(self):

    return self.get("virtual_ab_compression_method", "")

tools/releasetools/ota_from_target_files.py

+4 −1
Original line number Diff line number Diff line
@@ -831,6 +831,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  """Generates an Android OTA package that has A/B update payload."""

  # If input target_files are directories, create a copy so that we can modify

  # them directly

  target_info = common.BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts)

  if OPTIONS.disable_vabc and target_info.is_release_key:

    raise ValueError("Disabling VABC on release-key builds is not supported.")



  target_file = ExtractOrCopyTargetFiles(target_file)

  if source_file is not None:

    source_file = ExtractOrCopyTargetFiles(source_file)
@@ -874,7 +878,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  else:

    assert "ab_partitions" in OPTIONS.info_dict, \

        "META/ab_partitions.txt is required for ab_update."

    target_info = common.BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts)

    source_info = None

    if target_info.vabc_compression_param:

      minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[