commit a3ca934160694417e4cb2b9818f0e4362752c36f
author Alan Stokes <alanstokes@google.com> Tue Jan 11 13:51:31 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 11 13:51:31 2022 +0000
tree fe935ddc88dc7dda11aa13ac8c032d9e44aec11a
parent 65f85f89b8f5f290aa70b447769ba219b09e7193
parent 48c1d2b66485c12fc25609ed69824b76f9cc965c

Merge "Use odrefresh CompOS mode"

compos/src/compilation.rs

diff --git a/compos/src/compilation.rs b/compos/src/compilation.rs
index 50d79c1..4837029 100644
--- a/compos/src/compilation.rs
+++ b/compos/src/compilation.rs
@@ -151,6 +151,7 @@
 
     let mut args = vec![
         "odrefresh".to_string(),
+        "--compilation-os-mode".to_string(),
         format!("--zygote-arch={}", context.zygote_arch),
         format!("--dalvik-cache={}", context.target_dir_name),
         format!("--staging-dir={}", staging_dir.display()),
@@ -163,7 +164,8 @@
             context.system_server_compiler_filter
         ));
     }
-    args.push("--force-compile".to_string());
+
+    args.push("--compile".to_string());
 
     debug!("Running odrefresh with args: {:?}", &args);
     let jail = spawn_jailed_task(odrefresh_path, &args, Vec::new() /* fd_mapping */)