diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-23 18:03:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-23 18:03:14 +0000 |
commit | 2bd203da6f9d4e76fcc7d0baa239c97afa8628fa (patch) | |
tree | 7962bec55e7abfc11424fb5636cbcbbe4a13e585 | |
parent | 514eaef263672e6375ed82528c62133e7e3f8d2c (diff) | |
parent | 7e679ee12490fed110ef519053b0428570da1348 (diff) | |
download | ash-2bd203da6f9d4e76fcc7d0baa239c97afa8628fa.tar.gz |
Migrate to cargo_embargo. am: 7e679ee124
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ash/+/2796125
Change-Id: Ia1ef2eb9fd479240e5325d323c8c4bb4479c020a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 48 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | cargo_embargo.json | 8 |
3 files changed, 35 insertions, 30 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 { @@ -56,18 +56,21 @@ rust_test { "libloading", "loaded", ], - rustlibs: [ - "liblibloading", - ], + rustlibs: ["liblibloading"], } -rust_defaults { - name: "ash_test_defaults", - crate_name: "ash", +rust_test { + name: "ash_test_tests_constant_size_arrays", + host_supported: true, + crate_name: "constant_size_arrays", cargo_env_compat: true, cargo_pkg_version: "0.37.3+1.3.251", + srcs: ["tests/constant_size_arrays.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2021", features: [ "debug", @@ -82,23 +85,28 @@ rust_defaults { } rust_test { - name: "ash_test_tests_constant_size_arrays", - defaults: ["ash_test_defaults"], - host_supported: true, - srcs: ["tests/constant_size_arrays.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "ash_test_tests_display", - defaults: ["ash_test_defaults"], host_supported: true, + crate_name: "display", + cargo_env_compat: true, + cargo_pkg_version: "0.37.3+1.3.251", srcs: ["tests/display.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2021", + features: [ + "debug", + "default", + "libloading", + "loaded", + ], + rustlibs: [ + "libash_rust", + "liblibloading", + ], } rust_library { @@ -116,9 +124,7 @@ rust_library { "libloading", "loaded", ], - rustlibs: [ - "liblibloading", - ], + rustlibs: ["liblibloading"], apex_available: [ "//apex_available:platform", "com.android.virt", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6e516e0..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "device": true, - "run": true, - "tests": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..15db1a5 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "tests": true, + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "run_cargo": false +} |