Snap for 8564071 from 3c4a8b90186b4923b318e7a2335230053141b8ef to mainline-resolv-releaseaml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000android13-mainline-resolv-release

Change-Id: I9599c294aaa6d0b99aeb2ba90046057e44fdeafd

3 files changed, 24 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index 9336c24..242f48a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies --test.
+// 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_lru-cache_license"],
@@ -40,6 +41,8 @@ rust_library {
     name: "liblru_cache",
     host_supported: true,
     crate_name: "lru_cache",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.2",
     srcs: ["src/lib.rs"],
     edition: "2015",
     rustlibs: [
@@ -47,27 +50,20 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "lru-cache_defaults",
+rust_test {
+    name: "lru-cache_test_src_lib",
+    host_supported: true,
     crate_name: "lru_cache",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.2",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     rustlibs: [
         "liblinked_hash_map",
     ],
 }
-
-rust_test_host {
-    name: "lru-cache_host_test_src_lib",
-    defaults: ["lru-cache_defaults"],
-}
-
-rust_test {
-    name: "lru-cache_device_test_src_lib",
-    defaults: ["lru-cache_defaults"],
-}
-
-// dependent_library ["feature_list"]
-//   linked-hash-map-0.5.3
diff --git a/TEST_MAPPING b/TEST_MAPPING
index af8e296..e341227 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,13 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
 {
   "presubmit": [
     {
-      "name": "lru-cache_device_test_src_lib"
+      "name": "lru-cache_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "lru-cache_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file