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

Respect VABC Xor prop in ota_from_target_files

Browse Source 
Test: generate ota on a non-vabc xor target, make sure it's not used
Change-Id: Ibdbcfe3775c96848c37c7f580121583d4bd57fce
This commit is contained in:
Kelvin Zhang
2021-08-12 16:19:09 -07:00
parent 5a28a2af48
commit ad427381b9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/common.py
View File

@@ -448,6 +448,13 @@ class BuildInfo(object):
vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true" vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true"
return vabc_enabled return vabc_enabled
@property
def is_vabc_xor(self):
vendor_prop = self.info_dict.get("vendor.build.prop")
vabc_xor_enabled = vendor_prop and \
vendor_prop.GetProp("ro.virtual_ab.compression.xor.enabled") == "true"
return vabc_xor_enabled
@property @property
def vendor_suppressed_vabc(self): def vendor_suppressed_vabc(self):
vendor_prop = self.info_dict.get("vendor.build.prop") vendor_prop = self.info_dict.get("vendor.build.prop")

3
tools/releasetools/ota_from_target_files.py
View File

@@ -1091,6 +1091,9 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
if target_info.vendor_suppressed_vabc: if target_info.vendor_suppressed_vabc:
logger.info("Vendor suppressed VABC. Disabling") logger.info("Vendor suppressed VABC. Disabling")
OPTIONS.disable_vabc = True OPTIONS.disable_vabc = True
if not target_info.is_vabc_xor or OPTIONS.disable_vabc:
logger.info("VABC XOR Not supported, disabling")
OPTIONS.enable_vabc_xor = False
additional_args = [] additional_args = []
# Prepare custom images. # Prepare custom images.