Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: b064357e0d am: 29cbf768c3 am: ae864cc5bd am: 919c41e574
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bencher/+/1912516
Change-Id: I70bd7401cc0378e96fd12ef25cf6f828dfedce78
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 @@
],
}
-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.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/crc32fast"
+ },
+ {
+ "path": "external/rust/crates/url"
+ }
+ ],
"presubmit": [
{
- "name": "bencher_device_test_lib"
- },
+ "name": "bencher_test_lib"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "url_device_test_src_lib"
- },
- {
- "name": "url_device_test_tests_data"
- },
- {
- "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
