diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-23 13:18:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-23 13:18:36 +0000 |
commit | 703e838ef7d4effc2041ead8e96fb19767759567 (patch) | |
tree | 209a2d269f8fb35164466794510689ede86c4ba4 | |
parent | 739416bfdb0f8c363cb8a38716a58f7087095697 (diff) | |
parent | 65397d637b3017fbe766fc85e05d369036e465d8 (diff) | |
download | anyhow-703e838ef7d4effc2041ead8e96fb19767759567.tar.gz |
Migrate to cargo_embargo. am: 65397d637b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anyhow/+/2796407
Change-Id: I593bd3e2b5a240b061cab1749804cfc3bd9337a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 167 | ||||
-rw-r--r-- | cargo2android.json | 23 | ||||
-rw-r--r-- | cargo_embargo.json | 24 |
3 files changed, 168 insertions, 46 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 { @@ -60,13 +60,18 @@ rust_test { ], } -rust_defaults { - name: "anyhow_test_defaults", - crate_name: "anyhow", +rust_test { + name: "anyhow_test_tests_test_autotrait", + host_supported: true, + crate_name: "test_autotrait", cargo_env_compat: true, cargo_pkg_version: "1.0.69", + srcs: ["tests/test_autotrait.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -80,103 +85,219 @@ rust_defaults { } rust_test { - name: "anyhow_test_tests_test_autotrait", - defaults: ["anyhow_test_defaults"], - host_supported: true, - srcs: ["tests/test_autotrait.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "anyhow_test_tests_test_boxed", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_boxed", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_boxed.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_chain", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_chain", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_chain.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_context", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_context", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_context.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_convert", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_convert", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_convert.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_downcast", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_downcast", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_downcast.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_fmt", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_fmt", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_fmt.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_macros", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_macros", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_macros.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_repr", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_repr", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_repr.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_test { name: "anyhow_test_tests_test_source", - defaults: ["anyhow_test_defaults"], host_supported: true, + crate_name: "test_source", + cargo_env_compat: true, + cargo_pkg_version: "1.0.69", srcs: ["tests/test_source.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + ], + rustlibs: [ + "libanyhow", + "libfutures", + "libthiserror", + ], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6198806..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": true, - "dependency-blocklist": [ - "backtrace", - "rustversion", - "syn", - "trybuild" - ], - "device": true, - "min-sdk-version": "29", - "run": true, - "test-blocklist": [ - "tests/compiletest.rs", - "tests/test_backtrace.rs", - "tests/test_ensure.rs" - ], - "tests": true, - "vendor-available": true, - "product-available": true, - "cfg-blocklist": [ - "backtrace" - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..a7b61c5 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,24 @@ +{ + "tests": true, + "min_sdk_version": "29", + "package": { + "anyhow": { + "dep_blocklist": [ + "libbacktrace_rust", + "librustversion", + "libsyn", + "libtrybuild" + ] + } + }, + "cfg_blocklist": [ + "backtrace" + ], + "module_blocklist": [ + "anyhow_test_tests_compiletest", + "anyhow_test_tests_test_backtrace", + "anyhow_test_tests_test_ensure", + "anyhow_test_tests_test_ffi" + ], + "run_cargo": false +} |