Merge changes from topic "udroid-test-secret"
* changes:
Smoke tests for VM instance secrets
Add a random salt to microdroid data
diff --git a/.prebuilt_info/pvmfw.asciipb b/.prebuilt_info/pvmfw.asciipb
deleted file mode 100644
index 4199b2b..0000000
--- a/.prebuilt_info/pvmfw.asciipb
+++ /dev/null
@@ -1,12 +0,0 @@
-drops {
- android_build_drop {
- build_id: "8134799"
- target: "u-boot_pvmfw"
- source_file: "pvmfw.img"
- }
- dest_file: "pvmfw/pvmfw.img"
- version: ""
- version_group: ""
- git_project: "platform/packages/modules/Virtualization"
- git_branch: "master"
-}
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 8e9eb9d..827f9ff 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -482,8 +482,7 @@
let mut prop = PropertyWatcher::new(APEX_CONFIG_DONE_PROP)?;
loop {
prop.wait()?;
- let val = system_properties::read(APEX_CONFIG_DONE_PROP)?;
- if val == "true" {
+ if system_properties::read_bool(APEX_CONFIG_DONE_PROP, false)? {
break;
}
}
@@ -553,7 +552,7 @@
// Start logging if enabled
// TODO(b/200914564) set filterspec if debug_level is app_only
- if system_properties::read(LOGD_ENABLED_PROP)? == "1" {
+ if system_properties::read_bool(LOGD_ENABLED_PROP, false)? {
system_properties::write("ctl.start", "seriallogging")?;
}
diff --git a/pvmfw/pvmfw.img b/pvmfw/pvmfw.img
new file mode 100644
index 0000000..510b2c4
--- /dev/null
+++ b/pvmfw/pvmfw.img
Binary files differ