diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:43 +0000 |
commit | cc2b45b43870c2959d465a389d3f097ee6505dc9 (patch) | |
tree | 9e0dfc168ba2b8ff24858201977fba852ccd93ad | |
parent | 9ab27cf54dece56a92afa4bb56701b84ff34502a (diff) | |
parent | cdcc4c349489f3988f38a55985360b8fc13d422c (diff) | |
download | ash-cc2b45b43870c2959d465a389d3f097ee6505dc9.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 734d6cf237 am: 695c6aa4dc am: cdcc4c3494
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ash/+/1912043
Change-Id: Ia6120e5cdcb95eb4bb2c4c2345fa486b489ac542
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | TEST_MAPPING | 19 |
2 files changed, 19 insertions, 49 deletions
@@ -37,14 +37,18 @@ license { ], } -rust_defaults { - name: "ash_test_defaults", +rust_test { + name: "ash_test_src_lib", + host_supported: true, crate_name: "ash", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.33.3+1.2.191", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -55,21 +59,8 @@ rust_defaults { ], } -rust_test_host { - name: "ash_host_test_src_lib", - defaults: ["ash_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "ash_device_test_src_lib", - defaults: ["ash_test_defaults"], -} - rust_defaults { - name: "ash_test_defaults_ash", + name: "ash_test_defaults", crate_name: "ash", cargo_env_compat: true, cargo_pkg_version: "0.33.3+1.2.191", @@ -86,9 +77,10 @@ rust_defaults { ], } -rust_test_host { - name: "ash_host_test_tests_constant_size_arrays", - defaults: ["ash_test_defaults_ash"], +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, @@ -96,26 +88,15 @@ rust_test_host { } rust_test { - name: "ash_device_test_tests_constant_size_arrays", - defaults: ["ash_test_defaults_ash"], - srcs: ["tests/constant_size_arrays.rs"], -} - -rust_test_host { - name: "ash_host_test_tests_display", - defaults: ["ash_test_defaults_ash"], + name: "ash_test_tests_display", + defaults: ["ash_test_defaults"], + host_supported: true, srcs: ["tests/display.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "ash_device_test_tests_display", - defaults: ["ash_test_defaults_ash"], - srcs: ["tests/display.rs"], -} - rust_library { name: "libash_rust", stem: "libash", diff --git a/TEST_MAPPING b/TEST_MAPPING index 4addb0a..f439cf8 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,19 +1,8 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - // Manually disabled as these tests depend on specific graphics libraries - // being available on the machine running the tests. - //{ - // "name": "ash_device_test_src_lib" - //}, - //{ - // "name": "ash_device_test_tests_constant_size_arrays" - //}, - //{ - // "name": "ash_device_test_tests_display" - //}, - //{ - // "name": "vulkano_device_test_src_lib" - //} + "imports": [ + { + "path": "external/rust/crates/vulkano" + } ] } |