Snap for 8564071 from c7298f66b7cdeb4f7823202d950bab01aa5d5949 to mainline-tethering-releaseaml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150

Change-Id: Ifdb096d963b3617e74c9c04e4470689c8696e262

3 files changed, 139 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index b97f98c..7f4ff70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// 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_num-integer_license"],
@@ -38,22 +39,88 @@ license {
 
 rust_library {
     name: "libnum_integer",
+    // has rustc warnings
     host_supported: true,
     crate_name: "num_integer",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.44",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
         "default",
         "std",
     ],
-    flags: [
-        "--cfg has_i128",
+    cfgs: ["has_i128"],
+    rustlibs: [
+        "libnum_traits",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+}
+
+rust_test {
+    name: "num-integer_test_src_lib",
+    // has rustc warnings
+    host_supported: true,
+    crate_name: "num_integer",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.44",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2015",
+    features: [
+        "default",
+        "std",
+    ],
+    cfgs: ["has_i128"],
     rustlibs: [
         "libnum_traits",
     ],
 }
 
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   num-traits-0.2.14 "std"
+rust_defaults {
+    name: "num-integer_test_defaults",
+    crate_name: "num_integer",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.44",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+        "std",
+    ],
+    cfgs: ["has_i128"],
+    rustlibs: [
+        "libnum_integer",
+        "libnum_traits",
+    ],
+}
+
+rust_test {
+    name: "num-integer_test_tests_average",
+    defaults: ["num-integer_test_defaults"],
+    // has rustc warnings
+    host_supported: true,
+    srcs: ["tests/average.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "num-integer_test_tests_roots",
+    defaults: ["num-integer_test_defaults"],
+    // has rustc warnings
+    host_supported: true,
+    srcs: ["tests/roots.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..410aa98
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,57 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "imports": [
+    {
+      "path": "external/rust/crates/num-bigint"
+    },
+    {
+      "path": "external/rust/crates/oid-registry"
+    }
+  ],
+  "presubmit": [
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "libcert_request_validator_tests"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "num-integer_test_src_lib"
+    },
+    {
+      "name": "num-integer_test_tests_average"
+    },
+    {
+      "name": "num-integer_test_tests_roots"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "libcert_request_validator_tests"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "num-integer_test_src_lib"
+    },
+    {
+      "name": "num-integer_test_tests_average"
+    },
+    {
+      "name": "num-integer_test_tests_roots"
+    }
+  ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..8e490de
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "device": true,
+  "run": true,
+  "tests": true
+}