Merge changes Ic611f72d,Ib257a37d,I78ef198e,I7bcb0cd9
* changes:
authfs: Support write config/operation in fuse
authfs: Reorganize modules & rename flags/classes/vars
authfs: Remote file editor over binder
authfs: Implement VerifiedFileEditor
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index a6b1f95..00f34b9 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -4,6 +4,7 @@
bpfmt = true
clang_format = true
jsonlint = true
+google_java_format = true
pylint3 = true
rustfmt = true
xmllint = true
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 3eee6f4..e818420 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -37,6 +37,7 @@
use_avb: true,
avb_private_key: "microdroid.pem",
avb_algorithm: "SHA256_RSA4096",
+ partition_name: "system",
deps: [
"init_second_stage",
"microdroid_init_rc",
@@ -162,6 +163,8 @@
dtb_prebuilt: "dummy_dtb.img",
header_version: "4",
partition_name: "boot",
+ use_avb: true,
+ avb_private_key: "microdroid.pem",
}
android_filesystem {
@@ -189,6 +192,8 @@
header_version: "4",
vendor_boot: true,
partition_name: "vendor_boot",
+ use_avb: true,
+ avb_private_key: "microdroid.pem",
}
android_filesystem {
@@ -287,3 +292,34 @@
relative_install_path: "selinux",
installable: false,
}
+
+vbmeta {
+ name: "microdroid_vbmeta",
+ partition_name: "vbmeta",
+ private_key: "microdroid.pem",
+ partitions: [
+ "microdroid_vendor",
+ "microdroid_vendor_boot-5.10",
+ ],
+ chained_partitions: [
+ {
+ name: "vbmeta_system",
+ rollback_index_location: 1,
+ private_key: "microdroid.pem",
+ },
+ {
+ name: "boot",
+ rollback_index_location: 2,
+ private_key: "microdroid.pem",
+ },
+ ],
+}
+
+vbmeta {
+ name: "microdroid_vbmeta_system",
+ partition_name: "vbmeta_system",
+ private_key: "microdroid.pem",
+ partitions: [
+ "microdroid",
+ ],
+}
diff --git a/microdroid/README.md b/microdroid/README.md
index fe0843f..363d623 100644
--- a/microdroid/README.md
+++ b/microdroid/README.md
@@ -22,6 +22,8 @@
$ m microdroid_boot-5.10
$ m microdroid_vendor_boot-5.10
$ m microdroid_uboot_env
+$ m microdroid_vbmeta
+$ m microdroid_vbmeta_system
```
## Installing
@@ -34,6 +36,8 @@
$ adb push $ANDROID_PRODUCT_OUT/system/etc/microdroid_super.img /data/local/tmp/super.img
$ adb push $ANDROID_PRODUCT_OUT/system/etc/microdroid_boot-5.10.img /data/local/tmp/boot.img
$ adb push $ANDROID_PRODUCT_OUT/system/etc/microdroid_vendor_boot-5.10.img /data/local/tmp/vendor_boot.img
+$ adb push $ANDROID_PRODUCT_OUT/system/etc/microdroid_vbmeta.img /data/local/tmp/vbmeta.img
+$ adb push $ANDROID_PRODUCT_OUT/system/etc/microdroid_vbmeta_system.img /data/local/tmp/vbmeta_system.img
$ adb shell mkdir /data/local/tmp/cuttlefish_runtime.1/
$ adb push $ANDROID_PRODUCT_OUT/system/etc/uboot_env.img /data/local/tmp/cuttlefish_runtime.1/
$ adb shell mkdir -p /data/local/tmp/etc/cvd_config
@@ -41,8 +45,6 @@
$ dd if=/dev/zero of=empty.img bs=4k count=600
$ mkfs.ext4 -F empty.img
$ adb push empty.img /data/local/tmp/userdata.img
-$ adb push empty.img /data/local/tmp/vbmeta.img
-$ adb push empty.img /data/local/tmp/vbmeta_system.img
$ adb push empty.img /data/local/tmp/cache.img
```
@@ -52,7 +54,7 @@
future, this shall be done via [`virtmanager`](../virtmanager/).
```
-$ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd < /dev/null'
+$ adb shell 'HOME=/data/local/tmp; PATH=$PATH:/apex/com.android.virt/bin; assemble_cvd -protected_vm < /dev/null'
$ adb shell 'cd /data/local/tmp; /apex/com.android.virt/bin/crosvm run --cid=5 --disable-sandbox --bios=bootloader --serial=type=stdout --disk=cuttlefish_runtime/composite.img'
```
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index e07459a..c030e8d 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -14,6 +14,8 @@
":microdroid_uboot_env",
":cuttlefish_crosvm_bootloader",
":MicrodroidHostTestCase_EmptyImage",
+ ":microdroid_vbmeta",
+ ":microdroid_vbmeta_system",
],
}
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 7a45a8c..32b3c11 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -75,8 +75,8 @@
pushFile("microdroid_vendor_boot-5.10.img", "vendor_boot.img");
pushFile("uboot_env.img", "cuttlefish_runtime.1/uboot_env.img");
pushFile("empty.img", "userdata.img");
- pushFile("empty.img", "vbmeta.img");
- pushFile("empty.img", "vbmeta_system.img");
+ pushFile("microdroid_vbmeta.img", "vbmeta.img");
+ pushFile("microdroid_vbmeta_system.img", "vbmeta_system.img");
pushFile("empty.img", "cache.img");
getDevice().executeShellCommand("mkdir -p " + TEST_ROOT + "etc/cvd_config");
getDevice().pushString("{}", TEST_ROOT + "etc/cvd_config/cvd_config_phone.json");
@@ -84,7 +84,7 @@
// Run assemble_cvd to create composite.img
getDevice().executeShellCommand("HOME=" + TEST_ROOT + "; "
+ "PATH=$PATH:" + VIRT_APEX + "bin; "
- + VIRT_APEX + "bin/assemble_cvd < /dev/null");
+ + VIRT_APEX + "bin/assemble_cvd -protected_vm < /dev/null");
// Make sure that composite.img is created
final String compositeImg = TEST_ROOT + "cuttlefish_runtime/composite.img";
diff --git a/virtmanager/Android.bp b/virtmanager/Android.bp
index 5ff5db4..9fc4f42 100644
--- a/virtmanager/Android.bp
+++ b/virtmanager/Android.bp
@@ -9,7 +9,7 @@
edition: "2018",
rustlibs: [
"android.system.virtmanager-rust",
- "libenv_logger",
+ "libandroid_logger",
"liblog_rust",
"libserde_json",
"libserde",
diff --git a/virtmanager/src/main.rs b/virtmanager/src/main.rs
index 7cca4a9..486efeb 100644
--- a/virtmanager/src/main.rs
+++ b/virtmanager/src/main.rs
@@ -21,17 +21,22 @@
use crate::aidl::{VirtManager, BINDER_SERVICE_IDENTIFIER};
use android_system_virtmanager::aidl::android::system::virtmanager::IVirtManager::BnVirtManager;
use android_system_virtmanager::binder::{add_service, ProcessState};
-use log::info;
+use log::{info, Level};
/// The first CID to assign to a guest VM managed by the Virt Manager. CIDs lower than this are
/// reserved for the host or other usage.
const FIRST_GUEST_CID: Cid = 10;
+const LOG_TAG: &str = "VirtManager";
+
/// The unique ID of a VM used (together with a port number) for vsock communication.
type Cid = u32;
fn main() {
- env_logger::init();
+ android_logger::init_once(
+ android_logger::Config::default().with_tag(LOG_TAG).with_min_level(Level::Trace),
+ );
+
let virt_manager = VirtManager::default();
let virt_manager = BnVirtManager::new_binder(virt_manager);
add_service(BINDER_SERVICE_IDENTIFIER, virt_manager.as_binder()).unwrap();