aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorFrederick Mayle <fmayle@google.com>2022-07-19 20:09:03 +0000
committerFrederick Mayle <fmayle@google.com>2022-07-28 20:35:24 +0000
commitd0428075388df29313b015762236d693a17d53b5 (patch)
treef488e7a4d5c4e06e4a0108ac80c94a31ae69180e /Android.bp
parent3e59503386d6bf55f75f88c7cf67e80ea5af5064 (diff)
downloadcrosvm-d0428075388df29313b015762236d693a17d53b5.tar.gz
ANDROID: crosvm: Run cargo2android after merge
Set "no-pkg-vers" in the hypervisor crate. cargo2android is trying to get the pkg version for the src files in the "tests" directory and those don't seem to have pkg versions. There is currently no way to disable it for just part of the crate AFAIK. Had to manually enable a feature in the "vm_memory" crate. The "tracing" crate is now needed by the "devices" crate. It was only disabled because of a cargo2android bug https://r.android.com/2166722. Test: TH Bug: 239563396 Change-Id: Idf347a7597d714acc46e6f012b5701c9c0aa722e
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 25534e9fe..20ee95ef6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,6 +35,7 @@ license {
rust_binary {
name: "crosvm",
defaults: ["crosvm_defaults"],
+ // has rustc warnings
host_supported: true,
prefer_rlib: true,
crate_name: "crosvm",
@@ -68,6 +69,7 @@ rust_binary {
"libmetrics",
"libminijail_rust",
"libnet_util",
+ "libonce_cell",
"libp9",
"libresources",
"librutabaga_gfx",
@@ -148,6 +150,7 @@ rust_binary {
rust_test {
name: "crosvm_test_src_main",
defaults: ["crosvm_defaults"],
+ // has rustc warnings
host_supported: true,
crate_name: "crosvm",
cargo_env_compat: true,