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, 29 insertions, 21 deletions

diff --git a/Android.bp b/Android.bp
index 8d953db..45a10df 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_bencher_license"],
@@ -36,31 +37,29 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "bencher_defaults",
-    crate_name: "bencher",
+rust_test {
+    name: "bencher_test_lib",
     // has rustc warnings
+    host_supported: true,
+    crate_name: "bencher",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.5",
     srcs: ["lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
 }
 
-rust_test_host {
-    name: "bencher_host_test_lib",
-    defaults: ["bencher_defaults"],
-}
-
-rust_test {
-    name: "bencher_device_test_lib",
-    defaults: ["bencher_defaults"],
-}
-
 rust_library {
     name: "libbencher",
     // has rustc warnings
     host_supported: true,
     crate_name: "bencher",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.5",
     srcs: ["lib.rs"],
     edition: "2015",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9211dc4..6ea76c5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,17 +1,21 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "bencher_device_test_lib"
+      "path": "external/rust/crates/crc32fast"
     },
     {
-      "name": "url_device_test_src_lib"
-    },
+      "path": "external/rust/crates/url"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "url_device_test_tests_data"
-    },
+      "name": "bencher_test_lib"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "url_device_test_tests_unit"
+      "name": "bencher_test_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file