diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-10 23:42:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 23:42:25 +0000 |
commit | a763b43c378e588476f7c008a1834825c6ce2249 (patch) | |
tree | 1dd6a09c2e134f1b378ff7449335473c7560b0e3 | |
parent | 3b881ba1aeb64a7f646f46ab74a74ae6f35cd981 (diff) | |
parent | 1dc904532a50068d907da56c7831baa9aa395b6c (diff) | |
download | downcast-rs-a763b43c378e588476f7c008a1834825c6ce2249.tar.gz |
Migrate to cargo_embargo. am: 8d0b6101a8 am: 5fd908898f am: 1dc904532a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/downcast-rs/+/2824674
Change-Id: I77f48bcb9fcce062f2e8f61eee0402d317de18f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 39 | ||||
-rw-r--r-- | cargo2android.json | 13 | ||||
-rw-r--r-- | cargo_embargo.json | 5 |
3 files changed, 26 insertions, 31 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 { @@ -43,41 +43,44 @@ rust_test { ], } -rust_defaults { - name: "downcast-rs_test_defaults", - crate_name: "downcast_rs", +rust_test { + name: "downcast-rs_test_tests_import_via_macro_use", + host_supported: true, + crate_name: "import_via_macro_use", cargo_env_compat: true, cargo_pkg_version: "1.2.0", + srcs: ["tests/import_via_macro_use.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", "std", ], - rustlibs: [ - "libdowncast_rs", - ], -} - -rust_test { - name: "downcast-rs_test_tests_import_via_macro_use", - defaults: ["downcast-rs_test_defaults"], - host_supported: true, - srcs: ["tests/import_via_macro_use.rs"], - test_options: { - unit_test: true, - }, + rustlibs: ["libdowncast_rs"], } rust_test { name: "downcast-rs_test_tests_use_via_namespace", - defaults: ["downcast-rs_test_defaults"], host_supported: true, + crate_name: "use_via_namespace", + cargo_env_compat: true, + cargo_pkg_version: "1.2.0", srcs: ["tests/use_via_namespace.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2015", + features: [ + "default", + "std", + ], + rustlibs: ["libdowncast_rs"], } rust_library { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 7e748a8..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "product-available": true, - "run": true, - "tests": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..16616e0 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,5 @@ +{ + "min_sdk_version": "29", + "run_cargo": false, + "tests": true +} |