Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 3c69316d95
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fnv/+/1912520
Change-Id: I3f420981005eb07b0f522a48e9054461d0317b64
diff --git a/Android.bp b/Android.bp
index 103e9b4..585f0bc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,14 +37,18 @@
],
}
-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_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
