From 341fe0290378c280cba59898aa3e129237d5a5b0 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Wed, 9 Mar 2022 15:12:58 +0800 Subject: [PATCH] validate_target_files: support gki_arm64 gki_arm64 is a special target to build multiple GKI boot-*.img files. It has neither system.img nor vbmeta.img. Skips checking system.img and vbmeta.img in this case. Bug: 223078405 Test: validate_target_files signed-gki_arm64-target_files-8277156.zip Change-Id: I9d3c102c11787cf70c1e1fc8e6a552f8fd19ff72 --- tools/releasetools/common.py | 4 ---- tools/releasetools/validate_target_files.py | 11 +++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 9feb8af700..c2c6df1a9a 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -471,10 +471,6 @@ class BuildInfo(object): def oem_props(self): return self._oem_props - @property - def avb_enabled(self): - return self.get("avb_enable") == "true" - def __getitem__(self, key): return self.info_dict[key] diff --git a/tools/releasetools/validate_target_files.py b/tools/releasetools/validate_target_files.py index 282dc9905a..beb9e75dfd 100755 --- a/tools/releasetools/validate_target_files.py +++ b/tools/releasetools/validate_target_files.py @@ -131,8 +131,10 @@ def ValidateFileConsistency(input_zip, input_tmp, info_dict): logging.warning('Skipped due to target using non-sparse images') return - # Verify IMAGES/system.img. - CheckAllFiles('system') + # Verify IMAGES/system.img if applicable. + # Some targets, e.g., gki_arm64, gki_x86_64, etc., are system.img-less. + if 'IMAGES/system.img' in input_zip.namelist(): + CheckAllFiles('system') # Verify IMAGES/vendor.img if applicable. if 'VENDOR/' in input_zip.namelist(): @@ -259,9 +261,6 @@ def symlinkIfNotExists(src, dst): def ValidatePartitionFingerprints(input_tmp, 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: # 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' @@ -398,7 +397,7 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options): verity_key_mincrypt, stdoutdata.rstrip()) # Handle the case of Verified Boot 2.0 (AVB). - if info_dict.get("avb_enable") == "true": + if info_dict.get("avb_building_vbmeta_image") == "true": logging.info('Verifying Verified Boot 2.0 (AVB) images...') key = options['verity_key']