commit a933630970cf363f9d13fcc59308582c758921c4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 02 03:02:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 02 03:02:58 2021 +0000
tree 18f25680b117dee2a66b0486ca460cbb97e13d61
parent 3f7728e61e6460e376b3b1008f725b37571d1d4e
parent d058756a5cce0f24f0fc951abe1772a558ad7b72

Merge "Make port numbers aidl constants"

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 52c00b8..1638f6f 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -165,6 +165,7 @@
 
 android_filesystem {
     name: "microdroid_vendor",
+    partition_name: "vendor",
     use_avb: true,
     deps: [
         "android.hardware.security.keymint-service.microdroid",
@@ -194,11 +195,11 @@
     size: "auto",
     default_group: [
         {
-            name: "system",
+            name: "system_a",
             filesystem: ":microdroid",
         },
         {
-            name: "vendor",
+            name: "vendor_a",
             filesystem: ":microdroid_vendor",
         },
     ],
@@ -419,11 +420,6 @@
             rollback_index_location: 1,
             private_key: ":avb_testkey_rsa4096",
         },
-        {
-            name: "boot",
-            rollback_index_location: 2,
-            private_key: ":avb_testkey_rsa4096",
-        },
     ],
 }
 
@@ -433,6 +429,7 @@
     private_key: ":avb_testkey_rsa4096",
     partitions: [
         "microdroid",
+        "microdroid_boot-5.10",
     ],
 }
 

microdroid/fstab.microdroid

diff --git a/microdroid/fstab.microdroid b/microdroid/fstab.microdroid
index 129718e..f0e70b6 100644
--- a/microdroid/fstab.microdroid
+++ b/microdroid/fstab.microdroid
@@ -1,2 +1,2 @@
-system /system ext4 noatime,ro,errors=panic wait,first_stage_mount,logical
-vendor /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount,logical
+system /system ext4 noatime,ro,errors=panic wait,slotselect,avb=vbmeta_system,first_stage_mount,logical
+vendor /vendor ext4 noatime,ro,errors=panic wait,slotselect,avb=vbmeta,first_stage_mount,logical

microdroid/uboot-env-x86_64.txt

diff --git a/microdroid/uboot-env-x86_64.txt b/microdroid/uboot-env-x86_64.txt
index 1abafa6..fabe5b4 100644
--- a/microdroid/uboot-env-x86_64.txt
+++ b/microdroid/uboot-env-x86_64.txt
@@ -3,7 +3,7 @@
 # Boot the device following the Android boot procedure
 # `0` is the disk number of os_composite.img
 # `a` and `_a` are the slot index for A/B
-bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0 a
+bootcmd=avb init virtio 0 && avb verify _a && env set bootargs "$bootargs $avb_bootargs" && boot_android virtio 0 a
 
 bootdelay=0
 

microdroid/uboot-env.txt

diff --git a/microdroid/uboot-env.txt b/microdroid/uboot-env.txt
index 585702e..2c5bee7 100644
--- a/microdroid/uboot-env.txt
+++ b/microdroid/uboot-env.txt
@@ -3,7 +3,7 @@
 # Boot the device following the Android boot procedure
 # `0` is the disk number of os_composite.img
 # `a` and `_a` are the slot index for A/B
-bootcmd=avb init virtio 0 && avb verify _a && boot_android virtio 0 a
+bootcmd=avb init virtio 0 && avb verify _a && env set bootargs "$bootargs $avb_bootargs" && boot_android virtio 0 a
 
 bootdelay=0
 fdtaddr=0x80000000

vm/src/run.rs

diff --git a/vm/src/run.rs b/vm/src/run.rs
index 4b656ae..ccb4085 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -190,10 +190,12 @@
     }
 
     fn onPayloadReady(&self, _cid: i32) -> BinderResult<()> {
+        eprintln!("payload is ready");
         Ok(())
     }
 
-    fn onPayloadFinished(&self, _cid: i32, _exit_code: i32) -> BinderResult<()> {
+    fn onPayloadFinished(&self, _cid: i32, exit_code: i32) -> BinderResult<()> {
+        eprintln!("payload finished with exit code {}", exit_code);
         Ok(())
     }