DO NOT MERGE Remove cargo compat and nix tests
The modern updater tool adds two new fields to cargo imported packages.
Tokio does not strictly need either, and the build system for mainline
doesn't know about them yet, so they need to be removed to take the
update.
The tests in the new version of tokio are run on AOSP, but require an
updated version of the nix crate. To avoid a backport chain, I've simply
disabled those tests here.
Test: m
Bug: 206680413
Change-Id: I3fcc129036c9f1e8d166e838f1915d4c046b98fe
diff --git a/Android.bp b/Android.bp
index a89c568..a499240 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,8 +22,6 @@
name: "libtokio",
host_supported: true,
crate_name: "tokio",
- cargo_env_compat: true,
- cargo_pkg_version: "1.12.0",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -133,21 +131,6 @@
}
rust_test_host {
- name: "tokio_host_test_tests_io_async_fd",
- defaults: ["tokio_defaults_tokio"],
- srcs: ["tests/io_async_fd.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "tokio_device_test_tests_io_async_fd",
- defaults: ["tokio_defaults_tokio"],
- srcs: ["tests/io_async_fd.rs"],
-}
-
-rust_test_host {
name: "tokio_host_test_tests_io_async_read",
defaults: ["tokio_defaults_tokio"],
srcs: ["tests/io_async_read.rs"],
