StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-27 18:33:10 +00:00
committed by Gerrit Code Review
parent 19cd806de1 2f9a9ae64b
commit ad7f4666a6
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/common.py
View File

@@ -449,6 +449,11 @@ class BuildInfo(object):
system_prop = self.info_dict.get("system.build.prop") system_prop = self.info_dict.get("system.build.prop")
return system_prop and system_prop.GetProp("ro.build.version.release") == "11" 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 @property
def vabc_compression_param(self): def vabc_compression_param(self):
return self.get("virtual_ab_compression_method", "") return self.get("virtual_ab_compression_method", "")

5
tools/releasetools/ota_from_target_files.py
View File

@@ -831,6 +831,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
"""Generates an Android OTA package that has A/B update payload.""" """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 # If input target_files are directories, create a copy so that we can modify
# them directly # 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) target_file = ExtractOrCopyTargetFiles(target_file)
if source_file is not None: if source_file is not None:
source_file = ExtractOrCopyTargetFiles(source_file) source_file = ExtractOrCopyTargetFiles(source_file)
@@ -874,7 +878,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
else: else:
assert "ab_partitions" in OPTIONS.info_dict, \ assert "ab_partitions" in OPTIONS.info_dict, \
"META/ab_partitions.txt is required for ab_update." "META/ab_partitions.txt is required for ab_update."
target_info = common.BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts)
source_info = None source_info = None
if target_info.vabc_compression_param: if target_info.vabc_compression_param:
minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[ minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[