diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:23 +0000 |
commit | 68cee702f466616926430ad44825fa1ccd220c72 (patch) | |
tree | 05f76081e265f62fc5f58221c161d79345bcd699 | |
parent | 87f141a5fbcc45b573e092702f6bfe0058df9326 (diff) | |
parent | 72f3e005b997ed4e2271427bbddfa775ab1c0f6e (diff) | |
download | fnv-68cee702f466616926430ad44825fa1ccd220c72.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95 am: 7edfadee98 am: 72f3e005b9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1912520
Change-Id: Id4eac5a1913d3c737b896a7acfd4faf09f5c8a88
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 12 | ||||
-rw-r--r-- | cargo2android.json | 16 |
3 files changed, 26 insertions, 25 deletions
@@ -37,14 +37,18 @@ license { ], } -rust_defaults { - name: "fnv_test_defaults", +rust_test { + name: "fnv_test_lib", + host_supported: true, crate_name: "fnv", - srcs: ["lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.0.7", + srcs: ["lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -52,19 +56,6 @@ rust_defaults { ], } -rust_test_host { - name: "fnv_host_test_lib", - defaults: ["fnv_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "fnv_device_test_lib", - defaults: ["fnv_test_defaults"], -} - rust_library { name: "libfnv", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 82241e1..4c0b38e 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,8 +1,18 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/vulkano" + } + ], "presubmit": [ { - "name": "fnv_device_test_lib" + "name": "fnv_test_lib" + } + ], + "presubmit-rust": [ + { + "name": "fnv_test_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json index 86c645c..6e516e0 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,9 +1,9 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "device": true, - "run": true, - "tests": true - }
\ No newline at end of file + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |