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

Skip vbmeta_system if it doesn't exist

Browse Source 
Test: validate_target_files bonito-target_files-7582772.zip
Change-Id: I2da4f5a7897b1ef155e17441a8f5b97c0716d601
This commit is contained in:
Kelvin Zhang
2021-07-26 14:05:02 -04:00
parent f253430313
commit a19fb315e0
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/common.py
View File

@@ -459,6 +459,10 @@ class BuildInfo(object):
def oem_props(self): def oem_props(self):
return self._oem_props return self._oem_props
@property
def avb_enabled(self):
return self.get("avb_enable") == "true"
def __getitem__(self, key): def __getitem__(self, key):
return self.info_dict[key] return self.info_dict[key]

10
tools/releasetools/validate_target_files.py
View File

@@ -251,6 +251,9 @@ def symlinkIfNotExists(src, dst):
def ValidatePartitionFingerprints(input_tmp, info_dict): def ValidatePartitionFingerprints(input_tmp, info_dict):
build_info = common.BuildInfo(info_dict) build_info = common.BuildInfo(info_dict)
if not build_info.avb_enabled:
logging.info("AVB not enabled, skipping partition fingerprint checks")
return
# Expected format: # Expected format:
# Prop: com.android.build.vendor.fingerprint -> 'generic/aosp_cf_x86_64_phone/vsoc_x86_64:S/AOSP.MASTER/7335886:userdebug/test-keys' # Prop: com.android.build.vendor.fingerprint -> 'generic/aosp_cf_x86_64_phone/vsoc_x86_64:S/AOSP.MASTER/7335886:userdebug/test-keys'
# Prop: com.android.build.vendor_boot.fingerprint -> 'generic/aosp_cf_x86_64_phone/vsoc_x86_64:S/AOSP.MASTER/7335886:userdebug/test-keys' # Prop: com.android.build.vendor_boot.fingerprint -> 'generic/aosp_cf_x86_64_phone/vsoc_x86_64:S/AOSP.MASTER/7335886:userdebug/test-keys'
@@ -258,6 +261,13 @@ def ValidatePartitionFingerprints(input_tmp, info_dict):
r"Prop: com.android.build.(?P<partition>\w+).fingerprint -> '(?P<fingerprint>[\w\/:\.-]+)'") r"Prop: com.android.build.(?P<partition>\w+).fingerprint -> '(?P<fingerprint>[\w\/:\.-]+)'")
for vbmeta_partition in ["vbmeta", "vbmeta_system"]: for vbmeta_partition in ["vbmeta", "vbmeta_system"]:
image = os.path.join(input_tmp, "IMAGES", vbmeta_partition + ".img") image = os.path.join(input_tmp, "IMAGES", vbmeta_partition + ".img")
if not os.path.exists(image):
assert vbmeta_partition != "vbmeta",\
"{} is a required partition for AVB.".format(
vbmeta_partition)
logging.info("vb partition %s not present, skipping", vbmeta_partition)
continue
output = common.RunAndCheckOutput( output = common.RunAndCheckOutput(
[info_dict["avb_avbtool"], "info_image", "--image", image]) [info_dict["avb_avbtool"], "info_image", "--image", image])
matches = p.findall(output) matches = p.findall(output)