xref: /aosp_15_r20/external/crosvm/patches/Android.bp.patch (revision bb4ee6a4ae7042d18b07a98463b9c8b875e44b39) 
1*bb4ee6a4SAndroid Build Coastguard Workerdiff --git a/Android.bp b/Android.bp
2*bb4ee6a4SAndroid Build Coastguard Workerindex 5df1c8cdc..7bacdd74d 100644
3*bb4ee6a4SAndroid Build Coastguard Worker--- a/Android.bp
4*bb4ee6a4SAndroid Build Coastguard Worker+++ b/Android.bp
5*bb4ee6a4SAndroid Build Coastguard Worker@@ -36,6 +36,7 @@ rust_binary {
6*bb4ee6a4SAndroid Build Coastguard Worker     name: "crosvm",
7*bb4ee6a4SAndroid Build Coastguard Worker     defaults: ["crosvm_inner_defaults"],
8*bb4ee6a4SAndroid Build Coastguard Worker     host_supported: true,
9*bb4ee6a4SAndroid Build Coastguard Worker+    prefer_rlib: true,
10*bb4ee6a4SAndroid Build Coastguard Worker     crate_name: "crosvm",
11*bb4ee6a4SAndroid Build Coastguard Worker     cargo_env_compat: true,
12*bb4ee6a4SAndroid Build Coastguard Worker     cargo_pkg_version: "0.1.0",
13*bb4ee6a4SAndroid Build Coastguard Worker@@ -53,7 +54,6 @@ rust_binary {
14*bb4ee6a4SAndroid Build Coastguard Worker         "gdbstub_arch",
15*bb4ee6a4SAndroid Build Coastguard Worker         "geniezone",
16*bb4ee6a4SAndroid Build Coastguard Worker         "gfxstream",
17*bb4ee6a4SAndroid Build Coastguard Worker-        "gfxstream_stub",
18*bb4ee6a4SAndroid Build Coastguard Worker         "gpu",
19*bb4ee6a4SAndroid Build Coastguard Worker         "gpu_display",
20*bb4ee6a4SAndroid Build Coastguard Worker         "gunyah",
21*bb4ee6a4SAndroid Build Coastguard Worker@@ -134,6 +134,10 @@ rust_binary {
22*bb4ee6a4SAndroid Build Coastguard Worker         },
23*bb4ee6a4SAndroid Build Coastguard Worker         android: {
24*bb4ee6a4SAndroid Build Coastguard Worker             shared_libs: [
25*bb4ee6a4SAndroid Build Coastguard Worker+                // TODO(b/332677108): remove libc++ when display service is rewritten in rust.
26*bb4ee6a4SAndroid Build Coastguard Worker+                "libc++",
27*bb4ee6a4SAndroid Build Coastguard Worker+                "libbinder_ndk",
28*bb4ee6a4SAndroid Build Coastguard Worker+                "libnativewindow",
29*bb4ee6a4SAndroid Build Coastguard Worker                 "libprocessgroup",
30*bb4ee6a4SAndroid Build Coastguard Worker             ],
31*bb4ee6a4SAndroid Build Coastguard Worker         },
32*bb4ee6a4SAndroid Build Coastguard Worker@@ -142,6 +146,18 @@ rust_binary {
33*bb4ee6a4SAndroid Build Coastguard Worker                 "libprocessgroup",
34*bb4ee6a4SAndroid Build Coastguard Worker             ],
35*bb4ee6a4SAndroid Build Coastguard Worker         },
36*bb4ee6a4SAndroid Build Coastguard Worker+        linux_bionic_arm64: {
37*bb4ee6a4SAndroid Build Coastguard Worker+            relative_install_path: "aarch64-linux-bionic",
38*bb4ee6a4SAndroid Build Coastguard Worker+        },
39*bb4ee6a4SAndroid Build Coastguard Worker+        linux_glibc_x86_64: {
40*bb4ee6a4SAndroid Build Coastguard Worker+            relative_install_path: "x86_64-linux-gnu",
41*bb4ee6a4SAndroid Build Coastguard Worker+        },
42*bb4ee6a4SAndroid Build Coastguard Worker+        linux_musl_x86_64: {
43*bb4ee6a4SAndroid Build Coastguard Worker+            relative_install_path: "x86_64-linux-musl",
44*bb4ee6a4SAndroid Build Coastguard Worker+        },
45*bb4ee6a4SAndroid Build Coastguard Worker+        linux_musl_arm64: {
46*bb4ee6a4SAndroid Build Coastguard Worker+            relative_install_path: "aarch64-linux-musl",
47*bb4ee6a4SAndroid Build Coastguard Worker+        },
48*bb4ee6a4SAndroid Build Coastguard Worker     },
49*bb4ee6a4SAndroid Build Coastguard Worker     ld_flags: [
50*bb4ee6a4SAndroid Build Coastguard Worker         "-Wl,--rpath,\\$$ORIGIN",
51*bb4ee6a4SAndroid Build Coastguard Worker@@ -176,7 +192,6 @@ rust_test {
52*bb4ee6a4SAndroid Build Coastguard Worker         "gdbstub_arch",
53*bb4ee6a4SAndroid Build Coastguard Worker         "geniezone",
54*bb4ee6a4SAndroid Build Coastguard Worker         "gfxstream",
55*bb4ee6a4SAndroid Build Coastguard Worker-        "gfxstream_stub",
56*bb4ee6a4SAndroid Build Coastguard Worker         "gpu",
57*bb4ee6a4SAndroid Build Coastguard Worker         "gpu_display",
58*bb4ee6a4SAndroid Build Coastguard Worker         "gunyah",
59