commit f138b92d86e274b860b27496a680a2aaa79803e7
author Jiyong Park <jiyong@google.com> Mon Feb 22 17:21:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 17:21:50 2021 +0000
tree 1120ed4f63f7f4ba0e6fffdae6f6f8af4ce405fa
parent 0ac9b482b6b6b2534bda285bbef374398d78adad
parent f677cfab844ec982ce4655f3098205d97a340203

Merge "Build uboot_env.img statically"

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"],
 }
 

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 38c4e05..137355c 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -59,11 +59,21 @@
         "servicemanager",
         "tombstoned",
         "cgroups.json",
+
+        // These two files are temporary and only for test.
+        // TODO(b/178993690): migrate cil files to Soong
+        "microdroid_plat_sepolicy.cil",
+        "microdroid_plat_mapping_file",
     ] + microdroid_shell_and_utilities,
     multilib: {
         common: {
             deps: [
                 "com.android.runtime",
+                "plat_file_contexts",
+                "plat_hwservice_contexts",
+                "plat_property_contexts",
+                "plat_service_contexts",
+                "plat_keystore2_key_contexts",
             ],
         },
     },

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"],
         },
     },
 }