diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 08:07:25 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 08:07:25 +0000 |
commit | a8c59110cac60a7576b1f3cb683007b67dd5b74d (patch) | |
tree | 6568264214021f58808210f4dd283a07bafebfbf | |
parent | ca1ebcc270db869099c84b08e37b55f6587766b7 (diff) | |
parent | d20063e65cebf5d8014d1b311e996e4426805d20 (diff) | |
download | vsock-a8c59110cac60a7576b1f3cb683007b67dd5b74d.tar.gz |
Snap for 8189365 from d20063e65cebf5d8014d1b311e996e4426805d20 to tm-frc-neuralnetworks-release
Change-Id: I1780da96fe800ea23efc5f4224ef431343ddcf93
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 15 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | README.android | 3 | ||||
-rw-r--r-- | TEST_MAPPING | 19 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | src/lib.rs | 3 |
9 files changed, 18 insertions, 45 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 4fc9144..c3a6da8 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "56852d4006efce337875594e6a21ec49f0fc9c89" + "sha1": "c24bde75d75afb29563cc465f4c3e2cedfea69b9" } } @@ -1,5 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. -// Do not modify this file as changes will be overridden on upgrade. +// This file is generated by cargo2android.py --run --device --dependencies. package { default_applicable_licenses: ["external_rust_crates_vsock_license"], @@ -22,16 +21,16 @@ rust_library { name: "libvsock", host_supported: true, crate_name: "vsock", - cargo_env_compat: true, - cargo_pkg_version: "0.2.4", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "liblibc", "libnix", ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], } + +// dependent_library ["feature_list"] +// bitflags-1.2.1 "default" +// cfg-if-1.0.0 +// libc-0.2.86 "default,extra_traits,std" +// nix-0.19.1 @@ -13,7 +13,7 @@ [package] edition = "2018" name = "vsock" -version = "0.2.4" +version = "0.2.3" authors = ["fsyncd", "rust-vsock"] exclude = ["test_fixture"] description = "Virtio socket support for Rust" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index aa90128..afe8103 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "vsock" -version = "0.2.4" +version = "0.2.3" authors = ["fsyncd", "rust-vsock"] description = "Virtio socket support for Rust" repository = "https://github.com/rust-vsock/vsock-rs" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/vsock/vsock-0.2.4.crate" + value: "https://static.crates.io/crates/vsock/vsock-0.2.3.crate" } - version: "0.2.4" + version: "0.2.3" license_type: NOTICE last_upgrade_date { year: 2021 - month: 6 - day: 21 + month: 2 + day: 9 } } diff --git a/README.android b/README.android new file mode 100644 index 0000000..2ca244b --- /dev/null +++ b/README.android @@ -0,0 +1,3 @@ +local_modifications: + "Cherry-picked https://github.com/qwandor/vsock-rs/commit/4f73c26fc9a95e36e3ac4d304a02b6a424d7bcfd to fix Android build. This should be included in the next upstream release." + See patches/src.lib.diff diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index b7c1df9..0000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by update_crate_tests.py for tests that depend on this crate. -{ - "presubmit": [ - { - "name": "microdroid_manager_test" - }, - { - "name": "virtualizationservice_device_test" - } - ], - "presubmit-rust": [ - { - "name": "microdroid_manager_test" - }, - { - "name": "virtualizationservice_device_test" - } - ] -} diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 42b7833..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "run": true -}
\ No newline at end of file @@ -134,11 +134,10 @@ impl VsockListener { }; let mut vsock_addr_len = size_of::<sockaddr_vm>() as socklen_t; let socket = unsafe { - accept4( + accept( self.socket, &mut vsock_addr as *mut _ as *mut sockaddr, &mut vsock_addr_len, - SOCK_CLOEXEC, ) }; if socket < 0 { |