commit 8aa3cb177f52cd4de1199c3f02cc3449fd2012ac
author Alice Wang <aliceywang@google.com> Wed Jan 11 09:04:04 2023 +0000
committer Alice Wang <aliceywang@google.com> Wed Jan 11 20:53:53 2023 +0000
tree 3c4cc752cee721573dbfc126f49da064dde3456a
parent 962c31f4f80b00dc50be5c99cf84d33c1c59ea5f

[microdroid] Rename the partition name of microdroid_kernel to boot

Bug: 262853105
Test: atest libpvmfw_avb.test
Change-Id: Ic0d1f6b2c1023337a5fa2b8251fb40d80e162f37

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index c62db2d..1fc44a2 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -582,7 +582,7 @@
     name: "microdroid_kernel_signed",
     src: "empty_kernel",
     filename: "microdroid_kernel",
-    partition_name: "bootloader",
+    partition_name: "boot",
     private_key: ":microdroid_sign_key",
     salt: bootloader_salt,
     enabled: false,

pvmfw/avb/Android.bp

diff --git a/pvmfw/avb/Android.bp b/pvmfw/avb/Android.bp
index cbec235..d3a5e4e 100644
--- a/pvmfw/avb/Android.bp
+++ b/pvmfw/avb/Android.bp
@@ -62,7 +62,7 @@
 avb_add_hash_footer {
     name: "test_image_with_one_hashdesc",
     src: ":unsigned_test_image",
-    partition_name: "bootloader",
+    partition_name: "boot",
     private_key: ":pvmfw_sign_key",
     salt: "1111",
 }

pvmfw/avb/src/verify.rs

diff --git a/pvmfw/avb/src/verify.rs b/pvmfw/avb/src/verify.rs
index 0bab960..1e3f8ed 100644
--- a/pvmfw/avb/src/verify.rs
+++ b/pvmfw/avb/src/verify.rs
@@ -362,7 +362,7 @@
 }
 
 impl PartitionName {
-    const KERNEL_PARTITION_NAME: &[u8] = b"bootloader\0";
+    const KERNEL_PARTITION_NAME: &[u8] = b"boot\0";
     const INITRD_NORMAL_PARTITION_NAME: &[u8] = b"initrd_normal\0";
     const INITRD_DEBUG_PARTITION_NAME: &[u8] = b"initrd_debug\0";