Upgrade rust/vmm_vhost to fff997dda0625bd6f7c33bc0d79653c91b41b6c7
Test: make
Change-Id: I1911c42bc5dd48d381ad1978a3d21136233f4712
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index bda97eb..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "rust-vmm-ci"]
- path = rust-vmm-ci
- url = https://github.com/rust-vmm/rust-vmm-ci.git
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..2f38b2b
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,60 @@
+// This file is generated by cargo2android.py --run --device --features default,vhost-user,vhost-user-master,vhost-user-slave --global_defaults crosvm_defaults.
+// Do not modify this file as changes will be overridden on upgrade.
+
+package {
+ default_applicable_licenses: ["external_rust_vmm_vhost_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_rust_vmm_vhost_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "LICENSE",
+ "LICENSE-BSD-3-Clause",
+ "LICENSE-BSD-Chromium",
+ ],
+}
+
+rust_library {
+ name: "libvmm_vhost",
+ defaults: ["crosvm_defaults"],
+ host_supported: true,
+ crate_name: "vmm_vhost",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ features: [
+ "default",
+ "vhost-user",
+ "vhost-user-master",
+ "vhost-user-slave",
+ ],
+ rustlibs: [
+ "libbitflags",
+ "liblibc",
+ "libsys_util",
+ "libtempfile",
+ ],
+}
diff --git a/Cargo.toml b/Cargo.toml
index b5cb22d..94a7f45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,5 +29,5 @@
vm-memory = { version = "0.2.0", features=["backend-mmap"] }
[patch.crates-io]
-sys_util = { path = "../../../platform/crosvm/sys_util" } # ignored by ebuild
-tempfile = { path = "../../../platform/crosvm/tempfile" } # ignored by ebuild
+sys_util = { path = "../../../external/crosvm/sys_util" } # ignored by ebuild
+tempfile = { path = "../../../external/crosvm/tempfile" } # ignored by ebuild
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..8d5aa99
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,19 @@
+name: "rust_vmm_vhost"
+description: "A pure rust library for vDPA, vhost and vhost-user."
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/rust-vmm/vhost"
+ }
+ url {
+ type: GIT
+ value: "https://chromium.googlesource.com/chromiumos/third_party/rust-vmm/vhost"
+ }
+ version: "fff997dda0625bd6f7c33bc0d79653c91b41b6c7"
+ license_type: NOTICE
+ last_upgrade_date {
+ year: 2021
+ month: 8
+ day: 9
+ }
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/OWNERS b/OWNERS
index 3ec308a..c48e4ef 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
-chirantan@chromium.org
-dgreid@chromium.org
-keiichiw@chromium.org
-woodychow@chromium.org
+jemoreira@google.com
+chirantan@google.com
+dgreid@google.com
