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

Merge "Use misc_info.txt to check for VABC"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-01 22:30:19 +00:00
committed by Gerrit Code Review
parent 8844e4f145 e634bde6bd
commit ed1ab26f5d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/common.py
View File

@@ -450,10 +450,7 @@ class BuildInfo(object):
@property
def is_vabc(self):
vendor_prop = self.info_dict.get("vendor.build.prop")
vabc_enabled = vendor_prop and \
vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true"
return vabc_enabled
return self.info_dict.get("virtual_ab_compression") == "true"
@property
def is_android_r(self):
@@ -1396,7 +1393,8 @@ def RunHostInitVerifier(product_out, partition_map):
def AppendAVBSigningArgs(cmd, partition):
"""Append signing arguments for avbtool."""
# e.g., "--key path/to/signing_key --algorithm SHA256_RSA4096"
key_path = ResolveAVBSigningPathArgs(OPTIONS.info_dict.get("avb_" + partition + "_key_path"))
key_path = ResolveAVBSigningPathArgs(
OPTIONS.info_dict.get("avb_" + partition + "_key_path"))
algorithm = OPTIONS.info_dict.get("avb_" + partition + "_algorithm")
if key_path and algorithm:
cmd.extend(["--key", key_path, "--algorithm", algorithm])