tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use misc_info.txt to check for VABC" am: ed1ab26f5d am: 8583eae383 am: 764d7c01e7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572975

Change-Id: Ib52dd8ea7652f6695024a789cde5acde5de56be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-02 00:10:17 +00:00 committed by Automerger Merge Worker
commit 8359a9fc2a
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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):
@ -474,9 +471,9 @@ class BuildInfo(object):
for prop in props:
value = vendor_prop.GetProp(prop)
try:
return int(value)
return int(value)
except:
pass
pass
return -1
@property
@ -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])
@ -1415,7 +1413,7 @@ def ResolveAVBSigningPathArgs(split_args):
if os.path.exists(new_path):
return new_path
raise ExternalError(
"Failed to find {}".format(new_path))
"Failed to find {}".format(new_path))
if not split_args:
return split_args