Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

3 files changed, 30 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index 11e1f60..e87a1af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,6 @@ license {
 rust_library {
     name: "libhalf",
     host_supported: true,
-    vendor_available: true,
     crate_name: "half",
     cargo_env_compat: true,
     cargo_pkg_version: "1.7.1",
@@ -50,4 +49,5 @@ rust_library {
         "//apex_available:platform",
         "com.android.virt",
     ],
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e9029cf..403f641 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,47 +1,51 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/serde_cbor"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "serde_cbor_device_test_src_lib"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "serde_cbor_device_test_tests_bennofs"
+      "path": "external/rust/crates/unicode-xid"
     },
     {
-      "name": "serde_cbor_device_test_tests_canonical"
-    },
+      "path": "external/rust/crates/vulkano"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "serde_cbor_device_test_tests_de"
+      "name": "keystore2_test"
     },
     {
-      "name": "serde_cbor_device_test_tests_enum"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "serde_cbor_device_test_tests_ser"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "serde_cbor_device_test_tests_std_types"
-    },
+      "name": "microdroid_manager_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "serde_cbor_device_test_tests_tags"
+      "name": "keystore2_test"
     },
     {
-      "name": "serde_cbor_device_test_tests_value"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "microdroid_manager_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 6e21acc..84618e2 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,9 +1,9 @@
 {
-    "apex-available": [
-      "//apex_available:platform",
-      "com.android.virt"
-    ],
-    "vendor_available": true,
-    "device": true,
-    "run": true
-  }
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "device": true,
+  "run": true,
+  "vendor-available": true
+}
\ No newline at end of file