diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:01:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:01:56 +0000 |
commit | 29cbf768c3df90c71571491ed38a567f2337fc6e (patch) | |
tree | fda1c50f59d696ff26bf23591e8a56d58f55aba2 | |
parent | b1cce9b70359345bdc7f97347e8f9fdcf145e2eb (diff) | |
parent | b064357e0d19de07bd15c82317296baae7259d7a (diff) | |
download | bencher-29cbf768c3df90c71571491ed38a567f2337fc6e.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: b064357e0d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bencher/+/1912516
Change-Id: I5a2364d819c113fcef81be0aa46f6e6e16a5032f
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | TEST_MAPPING | 18 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 29 insertions, 21 deletions
@@ -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 |