Snap for 8347268 from de45d75cee85d33d4ab32eabf2e337b1e2ca912b to mainline-go-conscrypt-release

Change-Id: Iccf6a414a9c39793757b7b9ce62408d85f221acc

3 files changed, 20 insertions, 35 deletions

diff --git a/Android.bp b/Android.bp
index 80bcd09..df9a598 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --run --device --tests --dependencies --no-subdir.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,28 +22,24 @@ rust_library {
     name: "libmanaged",
     host_supported: true,
     crate_name: "managed",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.8.0",
     srcs: ["src/lib.rs"],
     edition: "2015",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
     features: [
         "default",
         "std",
     ],
 }
 
-rust_test {
-    name: "managed_test_src_lib",
-    host_supported: true,
+rust_defaults {
+    name: "managed_defaults",
     crate_name: "managed",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.8.0",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
     edition: "2015",
     features: [
         "default",
@@ -54,3 +50,16 @@ rust_test {
         "-C opt-level=1",
     ],
 }
+
+rust_test_host {
+    name: "managed_host_test_src_lib",
+    defaults: ["managed_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "managed_device_test_src_lib",
+    defaults: ["managed_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index f9cd6e4..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "imports": [
-    {
-      "path": "external/rust/crates/gdbstub_arch"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "managed_test_src_lib"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "managed_test_src_lib"
-    }
-  ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 1d312fd..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "device": true,
-  "no-subdir": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file