Merge "Add variant of libtokio for test" am: 9c455c5ce5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/2475668
Change-Id: I309e2edad0720d3b79f2d3409b826921573956e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index dc7e974..24cde59 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,10 +18,9 @@
],
}
-rust_library {
- name: "libtokio",
+rust_defaults {
+ name: "tokio_defaults",
host_supported: true,
- crate_name: "tokio",
cargo_env_compat: true,
cargo_pkg_version: "1.25.0",
srcs: ["src/lib.rs"],
@@ -65,6 +64,21 @@
min_sdk_version: "29",
}
+rust_library {
+ name: "libtokio",
+ crate_name: "tokio",
+ defaults: ["tokio_defaults"],
+}
+
+rust_library {
+ name: "libtokio_for_test",
+ crate_name: "tokio",
+ defaults: ["tokio_defaults"],
+ features: [
+ "test-util",
+ ],
+}
+
rust_defaults {
name: "tokio_defaults_tests",
crate_name: "tokio",
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..68fc808
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,39 @@
+diff --git a/Android.bp b/Android.bp
+index 7d066e6..58422c6 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -18,10 +18,9 @@
+ ],
+ }
+
+-rust_library {
+- name: "libtokio",
++rust_defaults {
++ name: "tokio_defaults",
+ host_supported: true,
+- crate_name: "tokio",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.25.0",
+ srcs: ["src/lib.rs"],
+@@ -64,6 +63,21 @@
+ min_sdk_version: "29",
+ }
+
++rust_library {
++ name: "libtokio",
++ crate_name: "tokio",
++ defaults: ["tokio_defaults"],
++}
++
++rust_library {
++ name: "libtokio_for_test",
++ crate_name: "tokio",
++ defaults: ["tokio_defaults"],
++ features: [
++ "test-util",
++ ],
++}
++
+ rust_defaults {
+ name: "tokio_defaults_tests",
+ crate_name: "tokio",
