Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d496848aec am: dd4580fe9a

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/1912792

Change-Id: I9c502b8a35318b2122449b29f44804ec75d4a786

3 files changed, 26 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index aa0f1a0..bb7ede7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,15 +60,19 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "parking_lot_core_test_defaults",
-    crate_name: "parking_lot_core",
+rust_test {
+    name: "parking_lot_core_test_src_lib",
     // has rustc warnings
-    srcs: ["src/lib.rs"],
+    host_supported: true,
+    crate_name: "parking_lot_core",
     cargo_env_compat: true,
     cargo_pkg_version: "0.8.5",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libcfg_if",
@@ -77,16 +81,3 @@ rust_defaults {
         "libsmallvec",
     ],
 }
-
-rust_test_host {
-    name: "parking_lot_core_host_test_src_lib",
-    defaults: ["parking_lot_core_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "parking_lot_core_device_test_src_lib",
-    defaults: ["parking_lot_core_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 98e9fcf..9284a57 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": "parking_lot_core_device_test_src_lib"
+      "name": "parking_lot_core_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "parking_lot_core_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index d28888a..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
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "device": true,
+  "run": true,
+  "tests": true
 }
\ No newline at end of file