Snap for 8570526 from 9a444811a6c4836debc274452d0240418ba6dd13 to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release

Change-Id: Iac0cb32cbd1e36232cc26ee818108a98615a2e0b

3 files changed, 37 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index af8bfb3..585f0bc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_fnv_license"],
@@ -36,12 +37,18 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "fnv_defaults",
+rust_test {
+    name: "fnv_test_lib",
+    host_supported: true,
     crate_name: "fnv",
+    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",
@@ -49,24 +56,20 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "fnv_host_test_lib",
-    defaults: ["fnv_defaults"],
-}
-
-rust_test {
-    name: "fnv_device_test_lib",
-    defaults: ["fnv_defaults"],
-}
-
 rust_library {
     name: "libfnv",
     host_supported: true,
     crate_name: "fnv",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.7",
     srcs: ["lib.rs"],
     edition: "2015",
     features: [
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 30d2306..4c0b38e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,18 @@
-// Generated by cargo2android.py for tests in Android.bp
+// 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
new file mode 100644
index 0000000..6e516e0
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file