commit 1e7b60379032dbf8b26bd7d6ad51f0ed878dcd76
author Jooyung Han <jooyung@google.com> Mon Nov 01 15:02:45 2021 +0900
committer Jooyung Han <jooyung@google.com> Mon Nov 01 15:05:47 2021 +0900
tree 33c3def6b12ded7831450956d8055af11ae7b366
parent e8102dca07ebe3d777ddc9ef40cf15dd3c10a6f6

Use 'package_native' for apexes wqith *classpath jars

Now package_native tells if staged apex contributes classpath jars.

Bug: 201788989
Test: MicrodroidHostTestCases (no regression)
Change-Id: I870e0584b16e90c6c4d90c2023d343b1eae6cc96

virtualizationservice/src/payload.rs

diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index a59afd5..bc184ec 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -132,7 +132,11 @@
                     let staged_apex_info = pm.getStagedApexInfo(&apex_info.name)?;
                     if let Some(staged_apex_info) = staged_apex_info {
                         apex_info.path = PathBuf::from(staged_apex_info.diskImagePath);
-                        // TODO(b/201788989) copy bootclasspath/systemserverclasspath
+                        apex_info.boot_classpath = staged_apex_info.hasBootClassPathJars;
+                        apex_info.systemserver_classpath =
+                            staged_apex_info.hasSystemServerClassPathJars;
+                        apex_info.dex2oatboot_classpath =
+                            staged_apex_info.hasDex2OatBootClassPathJars;
                     }
                 }
             }