commit 69b3937d8c3495e107b25952377a4dad3a8262e6
author Jiyong Park <jiyong@google.com> Tue Jan 05 23:14:46 2021 +0900
committer Jiyong Park <jiyong@google.com> Tue Jan 05 23:14:46 2021 +0900
tree c9db6183e6b2d8b197cfe4717dfbab8d5f6f6b42
parent bd28646007b183c5deebabb708d11d3c6a043f0b

Add crosvm to com.android.virt for x86_64 device target

Bug: 174639241
Test: choosecombo into aosp_cf_x86_64_phone. m com.android.virt
Change-Id: I21b9424a2741007508c7da302a9d63c451ea6112

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index b4f8284..3eaae4e 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -9,10 +9,15 @@
     key: "com.android.virt.key",
     certificate: ":com.android.virt.certificate",
 
+    // crosvm is enabled for only 64-bit targets on device
     arch: {
         arm64: {
             binaries: [
-                // crosvm is disabled for x86 device targets.
+                "crosvm",
+            ],
+        },
+        x86_64: {
+            binaries: [
                 "crosvm",
             ],
         },