aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2020-10-28 00:42:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-28 00:42:45 +0000
commitfbd38b1c9e792feb24275b115ca97e7ef8cb5aad (patch)
tree6ba864dd6c47625a0ee8d6539e297053f357e64b
parentf51a36e9b188d564ae148f573140958605d9f862 (diff)
parent7633436d8c2cf9b872763fb8c76142b76f5299fc (diff)
downloadvsock-fbd38b1c9e792feb24275b115ca97e7ef8cb5aad.tar.gz
Fix errors for external_updater. am: c7791e9a21 am: e11f231f09 am: 14bc116b49 am: 7633436d8c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vsock/+/1475301 Change-Id: I3946ac20f700294e2c4f2700d88960adc4c38426
-rw-r--r--Android.bp2
-rw-r--r--METADATA3
-rw-r--r--README.android3
3 files changed, 5 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 5c792d9..f0e343a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,6 @@ rust_library {
// dependent_library ["feature_list"]
// bitflags-1.2.1 "default"
// cfg-if-0.1.10
-// libc-0.2.77 "default,extra_traits,std"
+// libc-0.2.80 "default,extra_traits,std"
// nix-0.17.0
// void-1.0.2 "default,std"
diff --git a/METADATA b/METADATA
index be7a313..4e64bdb 100644
--- a/METADATA
+++ b/METADATA
@@ -1,5 +1,5 @@
name: "vsock"
-description: "Vsock support for Rust."
+description: "Virtio socket support for Rust"
third_party {
url {
type: HOMEPAGE
@@ -16,5 +16,4 @@ third_party {
month: 9
day: 28
}
- 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."
}
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