Snap for 10998794 from 65397d637b3017fbe766fc85e05d369036e465d8 to sdk-release

Change-Id: Ibb77e6612a52cf51ebfb8415205f60a6d0b359c7

3 files changed, 168 insertions, 46 deletions

diff --git a/Android.bp b/Android.bp
index 17f59e3..613a9c6 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 cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -60,13 +60,18 @@ rust_test {
     ],
 }
 
-rust_defaults {
-    name: "anyhow_test_defaults",
-    crate_name: "anyhow",
+rust_test {
+    name: "anyhow_test_tests_test_autotrait",
+    host_supported: true,
+    crate_name: "test_autotrait",
     cargo_env_compat: true,
     cargo_pkg_version: "1.0.69",
+    srcs: ["tests/test_autotrait.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -80,103 +85,219 @@ rust_defaults {
 }
 
 rust_test {
-    name: "anyhow_test_tests_test_autotrait",
-    defaults: ["anyhow_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/test_autotrait.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "anyhow_test_tests_test_boxed",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_boxed",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_boxed.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_chain",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_chain",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_chain.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_context",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_context",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_context.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_convert",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_convert",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_convert.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_downcast",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_downcast",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_downcast.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_fmt",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_fmt",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_fmt.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_macros",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_macros",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_macros.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_repr",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_repr",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_repr.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_test {
     name: "anyhow_test_tests_test_source",
-    defaults: ["anyhow_test_defaults"],
     host_supported: true,
+    crate_name: "test_source",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.69",
     srcs: ["tests/test_source.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libanyhow",
+        "libfutures",
+        "libthiserror",
+    ],
 }
 
 rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6198806..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "dependencies": true,
-  "dependency-blocklist": [
-    "backtrace",
-    "rustversion",
-    "syn",
-    "trybuild"
-  ],
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "test-blocklist": [
-    "tests/compiletest.rs",
-    "tests/test_backtrace.rs",
-    "tests/test_ensure.rs"
-  ],
-  "tests": true,
-  "vendor-available": true,
-  "product-available": true,
-  "cfg-blocklist": [
-    "backtrace"
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..a7b61c5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,24 @@
+{
+  "tests": true,
+  "min_sdk_version": "29",
+  "package": {
+    "anyhow": {
+      "dep_blocklist": [
+        "libbacktrace_rust",
+        "librustversion",
+        "libsyn",
+        "libtrybuild"
+      ]
+    }
+  },
+  "cfg_blocklist": [
+    "backtrace"
+  ],
+  "module_blocklist": [
+    "anyhow_test_tests_compiletest",
+    "anyhow_test_tests_test_backtrace",
+    "anyhow_test_tests_test_ensure",
+    "anyhow_test_tests_test_ffi"
+  ],
+  "run_cargo": false
+}