Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56cc49ea authored by Tianjie Xu's avatar Tianjie Xu Committed by Gerrit Code Review
Browse files

Merge changes I6ccf5fb9,I39a308fb 

* changes:
  Add a check for missing entries in AVB_FOOTER_ARGS_BY_PARTITION
  Add missing R partitions in AVB_FOOTER_ARGS
parents b10f7d2a bf0b8a86

tools/releasetools/common.py

+3 −1
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ SPECIAL_CERT_STRINGS = ("PRESIGNED", "EXTERNAL") 


# The partitions allowed to be signed by AVB (Android Verified Boot 2.0). Note

# that system_other is not in the list because we don't want to include its

# descriptor into vbmeta.img.

# descriptor into vbmeta.img. When adding a new entry here, the

# AVB_FOOTER_ARGS_BY_PARTITION in sign_target_files_apks need to be updated

# accordingly.

AVB_PARTITIONS = ('boot', 'dtbo', 'odm', 'product', 'pvmfw', 'recovery',

                  'system', 'system_ext', 'vendor', 'vendor_boot',

                  'vendor_dlkm', 'odm_dlkm')

tools/releasetools/sign_target_files_apks.py

+22 −10
Original line number Diff line number Diff line
@@ -180,17 +180,29 @@ OPTIONS.android_jar_path = None 
AVB_FOOTER_ARGS_BY_PARTITION = {

    'boot': 'avb_boot_add_hash_footer_args',

    'dtbo': 'avb_dtbo_add_hash_footer_args',

    'product': 'avb_product_add_hashtree_footer_args',

    'recovery': 'avb_recovery_add_hash_footer_args',

    'system': 'avb_system_add_hashtree_footer_args',

    'system_ext': 'avb_system_ext_add_hashtree_footer_args',

    'system_other': 'avb_system_other_add_hashtree_footer_args',

    'odm': 'avb_odm_add_hashtree_footer_args',

    'odm_dlkm': 'avb_odm_dlkm_add_hashtree_footer_args',

    'pvmfw': 'avb_pvmfw_add_hash_footer_args',

    'vendor': 'avb_vendor_add_hashtree_footer_args',

    'vendor_boot': 'avb_vendor_boot_add_hash_footer_args',

    'vendor_dlkm': "avb_vendor_dlkm_add_hashtree_footer_args",

    'vbmeta': 'avb_vbmeta_args',

    'vbmeta_system': 'avb_vbmeta_system_args',

    'vbmeta_vendor': 'avb_vbmeta_vendor_args',

}





# Check that AVB_FOOTER_ARGS_BY_PARTITION is in sync with AVB_PARTITIONS.

for partition in common.AVB_PARTITIONS:

  if partition not in AVB_FOOTER_ARGS_BY_PARTITION:

    raise RuntimeError("Missing {} in AVB_FOOTER_ARGS".format(partition))





def GetApkCerts(certmap):

  # apply the key remapping to the contents of the file

  for apk, cert in certmap.items():