Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 007c81710a am: bdfe1e91c0 am: a255357a17 am: 496e733b77

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

Change-Id: Ibcb87f9853f723599c087114520b99592c2a7d67

3 files changed, 9 insertions, 36 deletions

diff --git a/Android.bp b/Android.bp
index 8b145a9..188d72a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,30 +53,3 @@ rust_library {
         "com.android.virt",
     ],
 }
-
-rust_defaults {
-    name: "lock_api_test_defaults",
-    crate_name: "lock_api",
-    srcs: ["src/lib.rs"],
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.4.5",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    rustlibs: [
-        "libscopeguard",
-    ],
-}
-
-rust_test_host {
-    name: "lock_api_host_test_src_lib",
-    defaults: ["lock_api_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "lock_api_device_test_src_lib",
-    defaults: ["lock_api_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d3f0059..f439cf8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,8 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "lock_api_device_test_src_lib"
+      "path": "external/rust/crates/vulkano"
     }
   ]
 }
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