Remove support for forced-odrefresh
We now always use the async interface.
This doesn't remove as much as I'd hoped; we need to wait until we
always run odrefresh in the VM for the big wins.
Bug: 209572296
Test: Still builds
Change-Id: I4054aae788c85ba20ae050fd2f77cea1eed16870
diff --git a/compos/composd_cmd/composd_cmd.rs b/compos/composd_cmd/composd_cmd.rs
index 37d5378..41e2b1a 100644
--- a/compos/composd_cmd/composd_cmd.rs
+++ b/compos/composd_cmd/composd_cmd.rs
@@ -34,9 +34,11 @@
fn main() -> Result<()> {
let app = clap::App::new("composd_cmd").arg(
- clap::Arg::with_name("command").index(1).takes_value(true).required(true).possible_values(
- &["staged-apex-compile", "forced-compile-test", "forced-odrefresh", "async-odrefresh"],
- ),
+ clap::Arg::with_name("command")
+ .index(1)
+ .takes_value(true)
+ .required(true)
+ .possible_values(&["staged-apex-compile", "forced-compile-test", "async-odrefresh"]),
);
let args = app.get_matches();
let command = args.value_of("command").unwrap();
@@ -46,7 +48,6 @@
match command {
"staged-apex-compile" => run_staged_apex_compile()?,
"forced-compile-test" => run_forced_compile_for_test()?,
- "forced-odrefresh" => run_forced_odrefresh_for_test()?,
"async-odrefresh" => run_async_odrefresh_for_test()?,
_ => panic!("Unexpected command {}", command),
}
@@ -155,11 +156,3 @@
}
}
}
-
-fn run_forced_odrefresh_for_test() -> Result<()> {
- let service = wait_for_interface::<dyn IIsolatedCompilationService>("android.system.composd")
- .context("Failed to connect to composd service")?;
- let compilation_result = service.startTestOdrefresh().context("Compilation failed")?;
- println!("odrefresh exit code: {:?}", compilation_result);
- Ok(())
-}