Merge tag 'android-13.0.0_r38' into int/13/fp3
Android 13.0.0 Release 38 (TQ2A.230405.003)
* tag 'android-13.0.0_r38':
Set avb_hash_algorithm=sha256 for system & vendor img
Change-Id: I2a87aa7d9cc65c797732d19e0c1e9d59d08cc1c1
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index a1e81d2..5df1fb1 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -239,14 +239,15 @@
image_size = ReadBytesSize(info['Image size'])
algorithm = info['Algorithm']
partition_name = descriptor['Partition Name']
+ hash_algorithm = descriptor['Hash Algorithm']
partition_size = str(image_size)
-
cmd = ['avbtool', 'add_hashtree_footer',
'--key', key,
'--algorithm', algorithm,
'--partition_name', partition_name,
'--partition_size', partition_size,
'--do_not_generate_fec',
+ '--hash_algorithm', hash_algorithm,
'--image', image_path]
if args.signing_args:
cmd.extend(shlex.split(args.signing_args))
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 3be7eaa..d1a93c3 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -46,6 +46,7 @@
use_avb: true,
avb_private_key: ":microdroid_sign_key",
avb_algorithm: "SHA256_RSA4096",
+ avb_hash_algorithm: "sha256",
partition_name: "system",
deps: [
"init_second_stage",
@@ -206,6 +207,7 @@
},
avb_private_key: ":microdroid_sign_key",
avb_algorithm: "SHA256_RSA4096",
+ avb_hash_algorithm: "sha256",
file_contexts: ":microdroid_vendor_file_contexts.gen",
}