aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2020-10-26 17:44:00 -0700
committerChih-hung Hsieh <chh@google.com>2020-10-27 23:27:08 +0000
commitc7791e9a21c102dd43116f10b786edd6162893bf (patch)
tree6ba864dd6c47625a0ee8d6539e297053f357e64b
parentfcaa523d015c64924f793d38c1584f7f1a3efaf8 (diff)
downloadvsock-c7791e9a21c102dd43116f10b786edd6162893bf.tar.gz
Fix errors for external_updater.
* Unrecognized field name in METADATA kills external_updater. It is moved to README.android. * Local patch for src/lib.rs is omitted, assuming that the change will be in the next release. * The following update command test if the next update will preserve required local changes: updater.sh update --refresh --keep_date rust/crates/vsock Test: make Test: tools/external_updater/updater.sh update --refresh --keep_date rust/crates/vsock Change-Id: I39f61c37bcc25009b078b62d01057aad80f00ad9
-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