diff options
| author | Rahul Arya <aryarahul@google.com> | 2023-03-09 23:08:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-09 23:08:35 +0000 |
| commit | fcf80050cf649c6adafb91ab6a60f5337cf8772e (patch) | |
| tree | 3f713b8811219fff679f3a70c58574cc228f0412 | |
| parent | c9c9604e8291a970fba5edee8a99fd656dc5be38 (diff) | |
| parent | 9c455c5ce5f8661a5440d10122e69974a96138d8 (diff) | |
| download | tokio-fcf80050cf649c6adafb91ab6a60f5337cf8772e.tar.gz | |
Merge "Add variant of libtokio for test" am: 9c455c5ce5android-u-beta-1-gpl
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>
| -rw-r--r-- | Android.bp | 20 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 39 |
2 files changed, 56 insertions, 3 deletions
@@ -18,10 +18,9 @@ license { ], } -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 @@ rust_library { 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", |