diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-16 12:36:44 +0000 |
---|---|---|
committer | Andrew Walbran <qwandor@google.com> | 2023-11-16 12:36:44 +0000 |
commit | d19ea6527f8f40b18d96cc92b50f3c78118650db (patch) | |
tree | 7fb89dfed86a7922f7337e2a1d7c0ab714f32c13 | |
parent | 60b07a4b3222c5c0a266d3d092ed6bb685f4dd7b (diff) | |
download | futures-channel-d19ea6527f8f40b18d96cc92b50f3c78118650db.tar.gz |
Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: Icea976def4c2da7e32aafaec1962ee6663c078e9
-rw-r--r-- | Android.bp | 111 | ||||
-rw-r--r-- | cargo2android.json | 14 | ||||
-rw-r--r-- | cargo_embargo.json | 17 |
3 files changed, 108 insertions, 34 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -69,13 +69,18 @@ rust_test { ], } -rust_defaults { - name: "futures-channel_test_defaults", - crate_name: "futures_channel", +rust_test { + name: "futures-channel_test_tests_channel", + host_supported: true, + crate_name: "channel", cargo_env_compat: true, cargo_pkg_version: "0.3.26", + srcs: ["tests/channel.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "alloc", @@ -94,53 +99,119 @@ rust_defaults { } rust_test { - name: "futures-channel_test_tests_channel", - defaults: ["futures-channel_test_defaults"], + name: "futures-channel_test_tests_mpsc", host_supported: true, - srcs: ["tests/channel.rs"], + crate_name: "mpsc", + cargo_env_compat: true, + cargo_pkg_version: "0.3.26", + srcs: ["tests/mpsc.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "alloc", + "default", + "futures-sink", + "sink", + "std", + ], + rustlibs: [ + "libfutures", + "libfutures_channel", + "libfutures_core", + "libfutures_sink", + "libfutures_test", + ], } rust_test { name: "futures-channel_test_tests_mpsc-close", - defaults: ["futures-channel_test_defaults"], host_supported: true, + crate_name: "mpsc_close", + cargo_env_compat: true, + cargo_pkg_version: "0.3.26", srcs: ["tests/mpsc-close.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "alloc", + "default", + "futures-sink", + "sink", + "std", + ], + rustlibs: [ + "libfutures", + "libfutures_channel", + "libfutures_core", + "libfutures_sink", + "libfutures_test", + ], } rust_test { name: "futures-channel_test_tests_mpsc-size_hint", - defaults: ["futures-channel_test_defaults"], host_supported: true, + crate_name: "mpsc_size_hint", + cargo_env_compat: true, + cargo_pkg_version: "0.3.26", srcs: ["tests/mpsc-size_hint.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, -} - -rust_test { - name: "futures-channel_test_tests_mpsc", - defaults: ["futures-channel_test_defaults"], - host_supported: true, - srcs: ["tests/mpsc.rs"], - test_options: { - unit_test: true, - }, + edition: "2018", + features: [ + "alloc", + "default", + "futures-sink", + "sink", + "std", + ], + rustlibs: [ + "libfutures", + "libfutures_channel", + "libfutures_core", + "libfutures_sink", + "libfutures_test", + ], } rust_test { name: "futures-channel_test_tests_oneshot", - defaults: ["futures-channel_test_defaults"], host_supported: true, + crate_name: "oneshot", + cargo_env_compat: true, + cargo_pkg_version: "0.3.26", srcs: ["tests/oneshot.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "alloc", + "default", + "futures-sink", + "sink", + "std", + ], + rustlibs: [ + "libfutures", + "libfutures_channel", + "libfutures_core", + "libfutures_sink", + "libfutures_test", + ], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 4458799..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.btservices", - "com.android.resolv", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "features": "alloc,default,std,sink", - "min-sdk-version": "29", - "run": true, - "tests": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..8d7705e --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,17 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.btservices", + "com.android.resolv", + "com.android.virt" + ], + "features": [ + "alloc", + "default", + "std", + "sink" + ], + "min_sdk_version": "29", + "run_cargo": false, + "tests": true +} |