Reduce vm timeout am: 758f9fdbcf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2030144
Change-Id: I198b189dbc39d26b7a36a3f86e6f6c47befea13a
diff --git a/compos/common/timeouts.rs b/compos/common/timeouts.rs
index b3ec1e5..bdabb1e 100644
--- a/compos/common/timeouts.rs
+++ b/compos/common/timeouts.rs
@@ -26,8 +26,6 @@
pub struct Timeouts {
/// Total time that odrefresh may take to perform compilation
pub odrefresh_max_execution_time: Duration,
- /// Time allowed for a single compilation step run by odrefresh
- pub odrefresh_max_child_process_time: Duration,
/// Time allowed for the CompOS VM to start up and become ready.
pub vm_max_time_to_ready: Duration,
}
@@ -55,13 +53,11 @@
pub const NORMAL_TIMEOUTS: Timeouts = Timeouts {
// Note: the source of truth for these odrefresh timeouts is art/odrefresh/odr_config.h.
odrefresh_max_execution_time: Duration::from_secs(300),
- odrefresh_max_child_process_time: Duration::from_secs(90),
- vm_max_time_to_ready: Duration::from_secs(20),
+ vm_max_time_to_ready: Duration::from_secs(15),
};
/// The timeouts that we use when need_extra_time() returns true.
pub const EXTENDED_TIMEOUTS: Timeouts = Timeouts {
odrefresh_max_execution_time: Duration::from_secs(480),
- odrefresh_max_child_process_time: Duration::from_secs(150),
vm_max_time_to_ready: Duration::from_secs(120),
};