commit 8d1eb7ef0907a69d47ed4dc044f4f718de79c6c7
author Jiyong Park <jiyong@google.com> Tue Feb 16 13:23:00 2021 +0900
committer Jiyong Park <jiyong@google.com> Thu Feb 18 21:56:34 2021 +0900
tree c3ba971a2dfdd739496d6706ee2c1fc60094ef2b
parent cddaddf2b26ec212383d44b08194a1bd30e2c2e8

Add virtmanager to the virt APEX

We want to have virtmanager (and its dependencies) inside the APEX so
that they can be updated.

Bug: 180297657
Test: com.android.virt
Change-Id: I79935c99f8884a3260fc19f797466b47b3dc6583

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 4f7201a..0985577 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -26,7 +26,10 @@
             ],
         },
     },
-    binaries: ["assemble_cvd"],
+    binaries: [
+        "assemble_cvd",
+        "virtmanager",
+    ],
     filesystems: ["microdroid"],
 }
 

tests/hostside/AndroidTest.xml

diff --git a/tests/hostside/AndroidTest.xml b/tests/hostside/AndroidTest.xml
index c97a1df..0995881 100644
--- a/tests/hostside/AndroidTest.xml
+++ b/tests/hostside/AndroidTest.xml
@@ -26,7 +26,7 @@
         <!-- CrosVM is installed. -->
         <option name="run-command" value="ls /apex/com.android.virt/bin/crosvm" />
         <!-- Virt Manager is installed. -->
-        <option name="run-command" value="which virtmanager" />
+        <option name="run-command" value="ls /apex/com.android.virt/bin/virtmanager" />
     </target_preparer>
 
     <!-- Push test binaries to the device. -->

tests/hostside/java/android/virt/test/VsockTest.java

diff --git a/tests/hostside/java/android/virt/test/VsockTest.java b/tests/hostside/java/android/virt/test/VsockTest.java
index 4895c9a..9de4f2e 100644
--- a/tests/hostside/java/android/virt/test/VsockTest.java
+++ b/tests/hostside/java/android/virt/test/VsockTest.java
@@ -35,7 +35,7 @@
     private static final String   TEST_MESSAGE = "HelloWorld";
 
     private static final String   SERVER_TARGET = "vsock_server";
-    private static final String   VIRT_MANAGER_COMMAND = "virtmanager";
+    private static final String   VIRT_MANAGER_COMMAND = "/apex/com.android.virt/bin/virtmanager";
 
     @Test
     public void testVsockServer() throws Exception {

virtmanager/Android.bp

diff --git a/virtmanager/Android.bp b/virtmanager/Android.bp
index 04b7d8b..e22550c 100644
--- a/virtmanager/Android.bp
+++ b/virtmanager/Android.bp
@@ -11,4 +11,5 @@
         "libserde",
         "libanyhow",
     ],
+    apex_available: ["com.android.virt"],
 }

virtmanager/aidl/Android.bp

diff --git a/virtmanager/aidl/Android.bp b/virtmanager/aidl/Android.bp
index e46bd27..2782d45 100644
--- a/virtmanager/aidl/Android.bp
+++ b/virtmanager/aidl/Android.bp
@@ -12,6 +12,7 @@
         },
         rust: {
             enabled: true,
+            apex_available: ["com.android.virt"],
         },
     },
 }