Use libc::VMADDR_HOST_CID instead of custom consts
Test: builds
Change-Id: Ia13381b673a0c0c50daa80a5fb86bd6c6bd2aacd
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 748b497..3ab7552 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -39,6 +39,7 @@
use diced_utils::cbor::{encode_header, encode_number};
use glob::glob;
use itertools::sorted;
+use libc::VMADDR_CID_HOST;
use log::{error, info};
use microdroid_metadata::{write_metadata, Metadata, PayloadMetadata};
use microdroid_payload_config::{OsConfig, Task, TaskType, VmPayloadConfig};
@@ -75,9 +76,6 @@
const DEBUG_MICRODROID_NO_VERIFIED_BOOT: &str =
"/sys/firmware/devicetree/base/virtualization/guest/debug-microdroid,no-verified-boot";
-/// The CID representing the host VM
-const VMADDR_CID_HOST: u32 = 2;
-
const APEX_CONFIG_DONE_PROP: &str = "apex_config.done";
const APP_DEBUGGABLE_PROP: &str = "ro.boot.microdroid.app_debuggable";
const APK_MOUNT_DONE_PROP: &str = "microdroid_manager.apk.mounted";
@@ -779,8 +777,6 @@
}
fn build_command(task: &Task) -> Result<Command> {
- const VMADDR_CID_HOST: u32 = 2;
-
let mut command = match task.type_ {
TaskType::Executable => Command::new(&task.command),
TaskType::MicrodroidLauncher => {