Merge "Use virtio-console for the serial devices"
diff --git a/compos/apex/Android.bp b/compos/apex/Android.bp
index 3a9d5f5..9d18841 100644
--- a/compos/apex/Android.bp
+++ b/compos/apex/Android.bp
@@ -69,3 +69,11 @@
filename: "init.rc",
installable: false,
}
+
+sdk {
+ name: "compos-module-sdk",
+
+ native_shared_libs: [
+ "libcompos_client",
+ ],
+}
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index dc72c95..177a0db 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -240,13 +240,13 @@
/// virtualizationservice in the host side.
fn exec_task(task: &Task, service: &Strong<dyn IVirtualMachineService>) -> Result<()> {
info!("executing main task {:?}...", task);
- let mut child = build_command(task)?.spawn()?;
+ let mut command = build_command(task)?;
let local_cid = get_local_cid()?;
info!("notifying payload started");
service.notifyPayloadStarted(local_cid as i32)?;
- let exit_status = child.wait()?;
+ let exit_status = command.spawn()?.wait()?;
if let Some(code) = exit_status.code() {
info!("notifying payload finished");
service.notifyPayloadFinished(local_cid as i32, code)?;
diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index 4c71c37..a59afd5 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -21,7 +21,7 @@
};
use android_system_virtualizationservice::binder::ParcelFileDescriptor;
use anyhow::{anyhow, Context, Result};
-use binder::{wait_for_interface, Strong};
+use binder::wait_for_interface;
use log::{error, info};
use microdroid_metadata::{ApexPayload, ApkPayload, Metadata};
use microdroid_payload_config::{ApexConfig, VmPayloadConfig};
@@ -108,27 +108,28 @@
}
struct PackageManager {
- service: Strong<dyn IPackageManagerNative>,
// TODO(b/199146189) use IPackageManagerNative
apex_info_list: &'static ApexInfoList,
}
impl PackageManager {
fn new() -> Result<Self> {
- let service = wait_for_interface(PACKAGE_MANAGER_NATIVE_SERVICE)
- .context("Failed to find PackageManager")?;
let apex_info_list = ApexInfoList::load()?;
- Ok(Self { service, apex_info_list })
+ Ok(Self { apex_info_list })
}
fn get_apex_list(&self, prefer_staged: bool) -> Result<ApexInfoList> {
+ // get the list of active apexes
let mut list = self.apex_info_list.clone();
+ // When prefer_staged, we override ApexInfo by consulting "package_native"
if prefer_staged {
- // When prefer_staged, we override ApexInfo by consulting "package_native"
- let staged = self.service.getStagedApexModuleNames()?;
+ let pm =
+ wait_for_interface::<dyn IPackageManagerNative>(PACKAGE_MANAGER_NATIVE_SERVICE)
+ .context("Failed to get service when prefer_staged is set.")?;
+ let staged = pm.getStagedApexModuleNames()?;
for apex_info in list.list.iter_mut() {
if staged.contains(&apex_info.name) {
- let staged_apex_info = self.service.getStagedApexInfo(&apex_info.name)?;
+ let staged_apex_info = pm.getStagedApexInfo(&apex_info.name)?;
if let Some(staged_apex_info) = staged_apex_info {
apex_info.path = PathBuf::from(staged_apex_info.diskImagePath);
// TODO(b/201788989) copy bootclasspath/systemserverclasspath