diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-15 17:25:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-15 17:25:14 +0000 |
commit | d197cb75923d5f89e6d75d9387ce1a275352b09c (patch) | |
tree | a4a9aad9e3d6a5445e9abb7ad99ac2864e4f91ee | |
parent | f2e974bdf4efa0f6d32e99b65590d71210be3d9f (diff) | |
parent | 324ed130340e591a0ffbc2ef8d2a7b4a2d116be0 (diff) | |
download | crosvm-d197cb75923d5f89e6d75d9387ce1a275352b09c.tar.gz |
Merge "Add crosvm_defaults with only supported platforms."
35 files changed, 47 insertions, 38 deletions
diff --git a/Android.bp b/Android.bp index 5977cc2a1..d478c1608 100644 --- a/Android.bp +++ b/Android.bp @@ -2,18 +2,27 @@ // module name, enabled, relative_install_path, target, required, // flags, ld_flags, shared_libs, static_libs. +rust_defaults { + name: "crosvm_defaults", + edition: "2018", + enabled: false, + target: { + linux_glibc_x86_64: { + enabled: true, + }, + }, +} + rust_binary_host { name: "crosvm.experimental", + defaults: ["crosvm_defaults"], crate_name: "crosvm", - edition: "2018", - enabled: false, - relative_install_path: "x86_64-linux-gnu", srcs: ["src/main.rs"], target: { linux_glibc_x86_64: { + relative_install_path: "x86_64-linux-gnu", rlibs: ["libx86_64_rust"], - enabled: true, }, }, diff --git a/arch/Android.bp b/arch/Android.bp index ad67e073f..5bcf66417 100644 --- a/arch/Android.bp +++ b/arch/Android.bp @@ -4,7 +4,7 @@ rust_library_host_rlib { name: "libarch", crate_name: "arch", srcs: ["src/lib.rs"], - edition: "2018", + defaults: ["crosvm_defaults"], rlibs: [ "libbyteorder", "libdevices", diff --git a/assertions/Android.bp b/assertions/Android.bp index c7e5b59e3..cc51801b0 100644 --- a/assertions/Android.bp +++ b/assertions/Android.bp @@ -2,7 +2,7 @@ rust_library_host_rlib { name: "libassertions", + defaults: ["crosvm_defaults"], crate_name: "assertions", srcs: ["src/lib.rs"], - edition: "2018", } diff --git a/bit_field/Android.bp b/bit_field/Android.bp index 21bf9e731..ecf16496d 100644 --- a/bit_field/Android.bp +++ b/bit_field/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libbit_field", + defaults: ["crosvm_defaults"], crate_name: "bit_field", srcs: ["src/lib.rs"], - edition: "2018", proc_macros: [ "libbit_field_derive", ], diff --git a/bit_field/bit_field_derive/Android.bp b/bit_field/bit_field_derive/Android.bp index 460b93cfc..7d3d7116b 100644 --- a/bit_field/bit_field_derive/Android.bp +++ b/bit_field/bit_field_derive/Android.bp @@ -2,9 +2,9 @@ rust_proc_macro { name: "libbit_field_derive", + defaults: ["crosvm_defaults"], crate_name: "bit_field_derive", srcs: ["bit_field_derive.rs"], - edition: "2018", rlibs: [ "libproc_macro2", "libquote", diff --git a/data_model/Android.bp b/data_model/Android.bp index 478cd3a23..c8e178b24 100644 --- a/data_model/Android.bp +++ b/data_model/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libdata_model", + defaults: ["crosvm_defaults"], crate_name: "data_model", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libassertions", ], diff --git a/devices/Android.bp b/devices/Android.bp index c6114813c..e43350d2c 100644 --- a/devices/Android.bp +++ b/devices/Android.bp @@ -2,10 +2,10 @@ rust_library_host_rlib { name: "libdevices", + defaults: ["crosvm_defaults"], deny_warnings: false, crate_name: "devices", srcs: ["src/lib.rs"], - edition: "2018", features: [ "gpu", "gpu_buffer", diff --git a/enumn/Android.bp b/enumn/Android.bp index 271f58472..0cad3a751 100644 --- a/enumn/Android.bp +++ b/enumn/Android.bp @@ -2,9 +2,9 @@ rust_proc_macro { name: "libenumn", + defaults: ["crosvm_defaults"], crate_name: "enumn", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libproc_macro2", "libquote", diff --git a/gpu_buffer/Android.bp b/gpu_buffer/Android.bp index 334c3c629..abcb473da 100644 --- a/gpu_buffer/Android.bp +++ b/gpu_buffer/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libgpu_buffer", + defaults: ["crosvm_defaults"], crate_name: "gpu_buffer", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libdata_model", "libsys_util", diff --git a/gpu_display/Android.bp b/gpu_display/Android.bp index b65856fde..17a16f467 100644 --- a/gpu_display/Android.bp +++ b/gpu_display/Android.bp @@ -7,8 +7,8 @@ rust_library_host_rlib { name: "libgpu_display", + defaults: ["crosvm_defaults"], crate_name: "gpu_display", - edition: "2018", srcs: ["src/lib.rs"], rlibs: [ diff --git a/gpu_renderer/Android.bp b/gpu_renderer/Android.bp index bc5427c27..9181706a5 100644 --- a/gpu_renderer/Android.bp +++ b/gpu_renderer/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libgpu_renderer", + defaults: ["crosvm_defaults"], crate_name: "gpu_renderer", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libdata_model", "liblibc", diff --git a/io_jail/Android.bp b/io_jail/Android.bp index 8adfa4170..990fb3654 100644 --- a/io_jail/Android.bp +++ b/io_jail/Android.bp @@ -4,7 +4,7 @@ rust_library_host_rlib { name: "libio_jail", crate_name: "io_jail", srcs: ["src/lib.rs"], - edition: "2018", + defaults: ["crosvm_defaults"], rlibs: [ "liblibc", ], diff --git a/kernel_cmdline/Android.bp b/kernel_cmdline/Android.bp index d1bcbdac4..09f8613d2 100644 --- a/kernel_cmdline/Android.bp +++ b/kernel_cmdline/Android.bp @@ -2,10 +2,10 @@ rust_library_host_rlib { name: "libkernel_cmdline", + defaults: ["crosvm_defaults"], deny_warnings: false, crate_name: "kernel_cmdline", srcs: ["src/kernel_cmdline.rs"], - edition: "2018", rlibs: [ "liblibc", ], diff --git a/kernel_loader/Android.bp b/kernel_loader/Android.bp index f8c8935e1..d1450e195 100644 --- a/kernel_loader/Android.bp +++ b/kernel_loader/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libkernel_loader", + defaults: ["crosvm_defaults"], crate_name: "kernel_loader", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "liblibc", "libsys_util", diff --git a/kvm/Android.bp b/kvm/Android.bp index 85c5b753b..242ca4dad 100644 --- a/kvm/Android.bp +++ b/kvm/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libkvm", + defaults: ["crosvm_defaults"], crate_name: "kvm", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libkvm_sys", "liblibc", diff --git a/kvm_sys/Android.bp b/kvm_sys/Android.bp index dc2629d00..bb7a4f16d 100644 --- a/kvm_sys/Android.bp +++ b/kvm_sys/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libkvm_sys", + defaults: ["crosvm_defaults"], crate_name: "kvm_sys", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "liblibc", "libsys_util", diff --git a/msg_socket/Android.bp b/msg_socket/Android.bp index c36feda58..68b98e7eb 100644 --- a/msg_socket/Android.bp +++ b/msg_socket/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libmsg_socket", + defaults: ["crosvm_defaults"], crate_name: "msg_socket", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libdata_model", "libsys_util", diff --git a/msg_socket/msg_on_socket_derive/Android.bp b/msg_socket/msg_on_socket_derive/Android.bp index 1852bbf14..61f1b438c 100644 --- a/msg_socket/msg_on_socket_derive/Android.bp +++ b/msg_socket/msg_on_socket_derive/Android.bp @@ -2,9 +2,9 @@ rust_proc_macro { name: "libmsg_on_socket_derive", + defaults: ["crosvm_defaults"], crate_name: "msg_on_socket_derive", srcs: ["msg_on_socket_derive.rs"], - edition: "2018", rlibs: [ "libproc_macro2", "libquote", diff --git a/net_sys/Android.bp b/net_sys/Android.bp index c2f926e17..ae7a1ad1f 100644 --- a/net_sys/Android.bp +++ b/net_sys/Android.bp @@ -4,7 +4,7 @@ rust_library_host_rlib { name: "libnet_sys", crate_name: "net_sys", srcs: ["src/lib.rs"], - edition: "2018", + defaults: ["crosvm_defaults"], rlibs: [ "libsys_util", ], diff --git a/net_util/Android.bp b/net_util/Android.bp index ff693d769..14b59eddc 100644 --- a/net_util/Android.bp +++ b/net_util/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libnet_util", + defaults: ["crosvm_defaults"], crate_name: "net_util", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "liblibc", "libnet_sys", diff --git a/p9/Android.bp b/p9/Android.bp index 931cf78a1..d9beaa9dc 100644 --- a/p9/Android.bp +++ b/p9/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libp9", + defaults: ["crosvm_defaults"], crate_name: "p9", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "liblibc", ], diff --git a/p9/wire_format_derive/Android.bp b/p9/wire_format_derive/Android.bp index eaab7180e..97a2e805e 100644 --- a/p9/wire_format_derive/Android.bp +++ b/p9/wire_format_derive/Android.bp @@ -2,9 +2,9 @@ rust_proc_macro { name: "libwire_format_derive", + defaults: ["crosvm_defaults"], crate_name: "wire_format_derive", srcs: ["wire_format_derive.rs"], - edition: "2018", rlibs: [ "libproc_macro2", "libquote", diff --git a/qcow/Android.bp b/qcow/Android.bp index ed09ed40e..424f6b60a 100644 --- a/qcow/Android.bp +++ b/qcow/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libqcow", + defaults: ["crosvm_defaults"], crate_name: "qcow", srcs: ["src/qcow.rs"], - edition: "2018", rlibs: [ "libbyteorder", "libdata_model", diff --git a/rand_ish/Android.bp b/rand_ish/Android.bp index de1eea88d..0f9eb5fe7 100644 --- a/rand_ish/Android.bp +++ b/rand_ish/Android.bp @@ -2,7 +2,7 @@ rust_library_host_rlib { name: "librand_ish", + defaults: ["crosvm_defaults"], crate_name: "rand_ish", srcs: ["src/lib.rs"], - edition: "2018", } diff --git a/resources/Android.bp b/resources/Android.bp index 73e543758..ba7ae6146 100644 --- a/resources/Android.bp +++ b/resources/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libresources", + defaults: ["crosvm_defaults"], crate_name: "resources", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "liblibc", "libmsg_socket", diff --git a/sync/Android.bp b/sync/Android.bp index b68c85288..c97b810bd 100644 --- a/sync/Android.bp +++ b/sync/Android.bp @@ -2,8 +2,8 @@ rust_library_host_rlib { name: "libsync_rust", + defaults: ["crosvm_defaults"], stem: "libsync", crate_name: "sync", srcs: ["src/lib.rs"], - edition: "2018", } diff --git a/sys_util/Android.bp b/sys_util/Android.bp index ab1f65144..ad97c0bd2 100644 --- a/sys_util/Android.bp +++ b/sys_util/Android.bp @@ -2,10 +2,10 @@ rust_library_host_rlib { name: "libsys_util", + defaults: ["crosvm_defaults"], deny_warnings: false, crate_name: "sys_util", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libdata_model", "liblibc", diff --git a/sys_util/poll_token_derive/Android.bp b/sys_util/poll_token_derive/Android.bp index 7d6f98c66..edbc39f98 100644 --- a/sys_util/poll_token_derive/Android.bp +++ b/sys_util/poll_token_derive/Android.bp @@ -2,9 +2,9 @@ rust_proc_macro { name: "libpoll_token_derive", + defaults: ["crosvm_defaults"], crate_name: "poll_token_derive", srcs: ["poll_token_derive.rs"], - edition: "2018", rlibs: [ "libproc_macro2", "libquote", diff --git a/syscall_defines/Android.bp b/syscall_defines/Android.bp index cc5cb1762..15351920f 100644 --- a/syscall_defines/Android.bp +++ b/syscall_defines/Android.bp @@ -2,7 +2,7 @@ rust_library_host_rlib { name: "libsyscall_defines", + defaults: ["crosvm_defaults"], crate_name: "syscall_defines", srcs: ["src/lib.rs"], - edition: "2018", } diff --git a/tempfile/Android.bp b/tempfile/Android.bp index 227922c26..4999e5f43 100644 --- a/tempfile/Android.bp +++ b/tempfile/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libtempfile", + defaults: ["crosvm_defaults"], crate_name: "tempfile", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "librand_ish", ], diff --git a/usb_util/Android.bp b/usb_util/Android.bp index 5a616c8b7..3873bed46 100644 --- a/usb_util/Android.bp +++ b/usb_util/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libusb_util", + defaults: ["crosvm_defaults"], crate_name: "usb_util", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libassertions", "libdata_model", diff --git a/vhost/Android.bp b/vhost/Android.bp index 561403fd0..03640df44 100644 --- a/vhost/Android.bp +++ b/vhost/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libvhost", + defaults: ["crosvm_defaults"], crate_name: "vhost", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libassertions", "liblibc", diff --git a/virtio_sys/Android.bp b/virtio_sys/Android.bp index 7bf422402..1e8a00f15 100644 --- a/virtio_sys/Android.bp +++ b/virtio_sys/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libvirtio_sys", + defaults: ["crosvm_defaults"], crate_name: "virtio_sys", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libsys_util", ], diff --git a/vm_control/Android.bp b/vm_control/Android.bp index 69a38ad81..5a8789ce4 100644 --- a/vm_control/Android.bp +++ b/vm_control/Android.bp @@ -2,9 +2,9 @@ rust_library_host_rlib { name: "libvm_control", + defaults: ["crosvm_defaults"], crate_name: "vm_control", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libbyteorder", "libdata_model", diff --git a/x86_64/Android.bp b/x86_64/Android.bp index 4688f4ac8..0d8874b8b 100644 --- a/x86_64/Android.bp +++ b/x86_64/Android.bp @@ -2,10 +2,10 @@ rust_library_host_rlib { name: "libx86_64_rust", + defaults: ["crosvm_defaults"], stem: "libx86_64", crate_name: "x86_64", srcs: ["src/lib.rs"], - edition: "2018", rlibs: [ "libarch", "libassertions", |