commit 64d88626c498f76bfd3ecb37387d5c22443e53f2
author Victor Hsieh <victorhsieh@google.com> Wed Sep 21 17:32:00 2022 -0700
committer Victor Hsieh <victorhsieh@google.com> Thu Sep 22 10:14:27 2022 -0700
tree 5c43fc09153ec20aec431aabd48f4092a01273c7
parent 48a0d8f274473956b9c6763773c7ee9c6280281b

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

compos/src/compsvc.rs

diff --git a/compos/src/compsvc.rs b/compos/src/compsvc.rs
index baf444e..7ce60cd 100644
--- a/compos/src/compsvc.rs
+++ b/compos/src/compsvc.rs
@@ -102,6 +102,7 @@
         &self,
         compilation_mode: CompilationMode,
         system_dir_fd: i32,
+        system_ext_dir_fd: i32,
         output_dir_fd: i32,
         staging_dir_fd: i32,
         target_dir_name: &str,
@@ -119,6 +120,7 @@
         let context = to_binder_result(OdrefreshContext::new(
             compilation_mode,
             system_dir_fd,
+            if system_ext_dir_fd >= 0 { Some(system_ext_dir_fd) } else { None },
             output_dir_fd,
             staging_dir_fd,
             target_dir_name,