compos: compiling system server JARs in /system_ext
Bug: 246000387
Test: atest ComposHostTestCases odsign_e2e_tests (with and without
extra jar from /system_ext in SYSTEMSERVERCLASSPATH)
Change-Id: Ibf6b81e65a635dded5ec38ba5313ed00e9584acc
diff --git a/compos/composd/src/odrefresh_task.rs b/compos/composd/src/odrefresh_task.rs
index a07a7f9..9276fb1 100644
--- a/compos/composd/src/odrefresh_task.rs
+++ b/compos/composd/src/odrefresh_task.rs
@@ -162,8 +162,7 @@
let staging_dir_raw_fd = staging_dir_fd.as_raw_fd();
// Get the /system_ext FD differently because it may not exist.
- // TODO(245761690): pass system_ext_dir_raw_fd to service.odrefresh(...)
- let (_system_ext_dir_raw_fd, ro_dir_fds) =
+ let (system_ext_dir_raw_fd, ro_dir_fds) =
if let Ok(system_ext_dir_fd) = open_dir(Path::new("/system_ext")) {
(system_ext_dir_fd.as_raw_fd(), vec![system_dir_fd, system_ext_dir_fd])
} else {
@@ -184,6 +183,7 @@
let exit_code = service.odrefresh(
compilation_mode,
system_dir_raw_fd,
+ system_ext_dir_raw_fd,
output_dir_raw_fd,
staging_dir_raw_fd,
target_dir_name,