Migrate to the librustutils system property bindings.
Bug: 182498247
Test: Build
Change-Id: Ibd1937d9b44ed114dff0dacaabd6f20b81988b0a
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index dabcf31..7b9dadf 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -16,9 +16,9 @@
"libmicrodroid_metadata",
"libmicrodroid_payload_config",
"libprotobuf",
+ "librustutils",
"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 9efa68a..2586737 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -20,13 +20,13 @@
use anyhow::{anyhow, bail, Result};
use log::{error, info, warn};
use microdroid_payload_config::{Task, TaskType, VmPayloadConfig};
+use rustutils::system_properties::PropertyWatcher;
use std::fs::{self, File};
use std::os::unix::io::{FromRawFd, IntoRawFd};
use std::path::Path;
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) = system_properties::write("ro.vmsecret.keymint", fake_secret) {
+ if let Err(err) = rustutils::system_properties::write("ro.vmsecret.keymint", fake_secret) {
warn!("failed to set ro.vmsecret.keymint: {}", err);
}