Snap for 8570526 from 8893977427b70778d95b326b7bdd42edd9082240 to mainline-networking-releaseaml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010android13-mainline-networking-release

Change-Id: I458cc4137e5330c6fbf35857ef0ce322de4a65d6

3 files changed, 72 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 27af338..2034097 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// 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_scopeguard_license"],
@@ -40,33 +41,38 @@ rust_library {
     name: "libscopeguard",
     host_supported: true,
     crate_name: "scopeguard",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.0",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
         "default",
         "use_std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.bluetooth",
+        "com.android.compos",
+        "com.android.virt",
+    ],
+    min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "scopeguard_defaults",
+rust_test {
+    name: "scopeguard_test_src_lib",
+    host_supported: true,
     crate_name: "scopeguard",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.0",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
         "use_std",
     ],
 }
-
-rust_test_host {
-    name: "scopeguard_host_test_src_lib",
-    defaults: ["scopeguard_defaults"],
-}
-
-rust_test {
-    name: "scopeguard_device_test_src_lib",
-    defaults: ["scopeguard_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3ac1ffc..af52a19 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,11 +1,48 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-deque"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-epoch"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    },
+    {
+      "path": "external/rust/crates/vulkano"
+    }
+  ],
   "presubmit": [
     {
-      "name": "scopeguard_device_test_src_lib"
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "scopeguard_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "apkdmverity.test"
     },
     {
-      "name": "lock_api_device_test_src_lib"
+      "name": "scopeguard_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..4384672
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,13 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.bluetooth",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "min-sdk-version": "29",
+  "run": true,
+  "tests": true
+}