Merge changes I72aead02,I0c3015f1
* changes:
Use CompOsKeyService as compsvc factory.
Split compsvc.rs.
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index 902b5da..dabcf31 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -11,7 +11,6 @@
rustlibs: [
"libanyhow",
"libkernlog",
- "libkeystore2_system_property-rust",
"liblibc",
"liblog_rust",
"libmicrodroid_metadata",
@@ -19,6 +18,7 @@
"libprotobuf",
"libserde",
"libserde_json",
+ "libsystem_properties-rust",
"libvsock",
],
init_rc: ["microdroid_manager.rc"],
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 1506142..9efa68a 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -18,7 +18,6 @@
mod metadata;
use anyhow::{anyhow, bail, Result};
-use keystore2_system_property::PropertyWatcher;
use log::{error, info, warn};
use microdroid_payload_config::{Task, TaskType, VmPayloadConfig};
use std::fs::{self, File};
@@ -27,6 +26,7 @@
use std::process::{Command, Stdio};
use std::str;
use std::time::Duration;
+use system_properties::PropertyWatcher;
use vsock::VsockStream;
const WAIT_TIMEOUT: Duration = Duration::from_secs(10);
@@ -40,7 +40,7 @@
let config = load_config(Path::new(&metadata.payload_config_path))?;
let fake_secret = "This is a placeholder for a value that is derived from the images that are loaded in the VM.";
- if let Err(err) = keystore2_system_property::write("ro.vmsecret.keymint", fake_secret) {
+ if let Err(err) = system_properties::write("ro.vmsecret.keymint", fake_secret) {
warn!("failed to set ro.vmsecret.keymint: {}", err);
}