Remove task-profile
--host-cpu-topology made it obsolete.
Bug: 325723941
Test: m
Change-Id: Id98e53cb92a1e7bbe9455f70d9426de0e8dc2008
diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index a8a176a..abaa74c 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -62,8 +62,6 @@
pub debug_mode: bool,
/// CPU topology of the VM. Defaults to 1 vCPU.
pub cpu_topology: VmCpuTopology,
- /// List of task profiles to apply to the VM
- pub task_profiles: Vec<String>,
/// If present, overrides the amount of RAM to give the VM
pub memory_mib: Option<i32>,
/// Whether the VM prefers staged APEXes or activated ones (false; default)
@@ -131,10 +129,7 @@
protectedVm: protected_vm,
memoryMib: parameters.memory_mib.unwrap_or(0), // 0 means use the default
cpuTopology: cpu_topology,
- customConfig: Some(CustomConfig {
- taskProfiles: parameters.task_profiles.clone(),
- ..Default::default()
- }),
+ customConfig: Some(CustomConfig { ..Default::default() }),
});
// Let logs go to logcat.
@@ -144,7 +139,7 @@
service,
&config,
console_fd,
- /*console_in_fd */ None,
+ /* console_in_fd */ None,
log_fd,
Some(callback),
)
diff --git a/compos/composd/src/instance_manager.rs b/compos/composd/src/instance_manager.rs
index 510ad11..9e94035 100644
--- a/compos/composd/src/instance_manager.rs
+++ b/compos/composd/src/instance_manager.rs
@@ -82,9 +82,8 @@
// a system property. Start the VM with all CPUs and assume the guest will start a suitable
// number of dex2oat threads.
let cpu_topology = VmCpuTopology::MatchHost;
- let task_profiles = vec!["SCHED_SP_COMPUTE".to_string()];
let memory_mib = Some(compos_memory_mib()?);
- Ok(VmParameters { cpu_topology, task_profiles, memory_mib, ..Default::default() })
+ Ok(VmParameters { cpu_topology, memory_mib, ..Default::default() })
}
fn compos_memory_mib() -> Result<i32> {