• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/Android.bp b/Android.bp
2index 5df1c8cdc..7bacdd74d 100644
3--- a/Android.bp
4+++ b/Android.bp
5@@ -36,6 +36,7 @@ rust_binary {
6     name: "crosvm",
7     defaults: ["crosvm_inner_defaults"],
8     host_supported: true,
9+    prefer_rlib: true,
10     crate_name: "crosvm",
11     cargo_env_compat: true,
12     cargo_pkg_version: "0.1.0",
13@@ -53,7 +54,6 @@ rust_binary {
14         "gdbstub_arch",
15         "geniezone",
16         "gfxstream",
17-        "gfxstream_stub",
18         "gpu",
19         "gpu_display",
20         "gunyah",
21@@ -142,6 +146,18 @@ rust_binary {
22                 "libprocessgroup",
23             ],
24         },
25+        linux_bionic_arm64: {
26+            relative_install_path: "aarch64-linux-bionic",
27+        },
28+        linux_glibc_x86_64: {
29+            relative_install_path: "x86_64-linux-gnu",
30+        },
31+        linux_musl_x86_64: {
32+            relative_install_path: "x86_64-linux-musl",
33+        },
34+        linux_musl_arm64: {
35+            relative_install_path: "aarch64-linux-musl",
36+        },
37     },
38     ld_flags: [
39         "-Wl,--rpath,\\$$ORIGIN",
40@@ -176,7 +192,6 @@ rust_test {
41         "gdbstub_arch",
42         "geniezone",
43         "gfxstream",
44-        "gfxstream_stub",
45         "gpu",
46         "gpu_display",
47         "gunyah",
48