diff options
author | Joel Galenson <jgalenson@google.com> | 2021-08-18 15:33:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-18 15:33:20 +0000 |
commit | e32c767e56c7222f2161260ccb72657c2805249e (patch) | |
tree | 4d68a4a8055b33213a4a25f24bbd8d684c8975d4 | |
parent | 23e2c478d9bd0d6c06db95bdf2a5acb950f4e8fe (diff) | |
parent | 9b7d785fc905ffedc096bbe7cb90d231e1dac6a9 (diff) | |
download | vmm_vhost-e32c767e56c7222f2161260ccb72657c2805249e.tar.gz |
Upgrade rust/vmm_vhost to fff997dda0625bd6f7c33bc0d79653c91b41b6c7 am: 570efe19a5 am: e3d37b987c am: 9b7d785fc9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vmm_vhost/+/1791050
Change-Id: I6bcb9c940191f3f3d12222783dddc540e66cd14a
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Cargo.toml | 9 | ||||
-rw-r--r-- | METADATA | 6 |
3 files changed, 9 insertions, 9 deletions
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 @@ -21,10 +21,13 @@ vhost-user-slave = ["vhost-user"] [dependencies] bitflags = ">=1.0.1" libc = ">=0.2.39" - -sys_util = { path = "../../../external/crosvm/sys_util" } # provided by ebuild -tempfile = { path = "../../../external/crosvm/tempfile" } # provided by ebuild +sys_util = "*" +tempfile = "*" vm-memory = { version = "0.2.0", optional = true } [dev-dependencies] vm-memory = { version = "0.2.0", features=["backend-mmap"] } + +[patch.crates-io] +sys_util = { path = "../../../external/crosvm/sys_util" } # ignored by ebuild +tempfile = { path = "../../../external/crosvm/tempfile" } # ignored by ebuild @@ -9,11 +9,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromiumos/third_party/rust-vmm/vhost" } - version: "eaca5d36a2701c99b354ab5bc0954a78dfc9ff4f" + version: "fff997dda0625bd6f7c33bc0d79653c91b41b6c7" license_type: NOTICE last_upgrade_date { year: 2021 - month: 5 - day: 19 + month: 8 + day: 9 } } |