diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 08:09:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 08:09:35 +0000 |
commit | 7fe30771bd0872895da4122761b645bc6c1de535 (patch) | |
tree | 8f7e9d0f7caa4b382159fa8c8c9caf1d1f58af51 | |
parent | b345902525130ad6ebbe052cae74cc673a5df93c (diff) | |
parent | 74ff1c93e36cb981f6fa0fe1e8e50fbabe2db89f (diff) | |
download | bencher-7fe30771bd0872895da4122761b645bc6c1de535.tar.gz |
Snap for 8189365 from 74ff1c93e36cb981f6fa0fe1e8e50fbabe2db89f to tm-frc-os-statsd-release
Change-Id: I56979a15d56db055b3c17f641c3d0d272468b0e5
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | TEST_MAPPING | 17 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 16 insertions, 33 deletions
@@ -1,5 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. -// Do not modify this file as changes will be overridden on upgrade. +// This file is generated by cargo2android.py --run --device --dependencies --tests. package { default_applicable_licenses: ["external_rust_crates_bencher_license"], @@ -37,29 +36,31 @@ license { ], } -rust_test { - name: "bencher_test_lib", - // has rustc warnings - host_supported: true, +rust_defaults { + name: "bencher_defaults", crate_name: "bencher", - cargo_env_compat: true, - cargo_pkg_version: "0.1.5", + // has rustc warnings 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 6ea76c5..689a71b 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,21 +1,8 @@ -// Generated by update_crate_tests.py for tests that depend on this crate. +// Generated by cargo2android.py for tests in Android.bp { - "imports": [ - { - "path": "external/rust/crates/crc32fast" - }, - { - "path": "external/rust/crates/url" - } - ], "presubmit": [ { - "name": "bencher_test_lib" - } - ], - "presubmit-rust": [ - { - "name": "bencher_test_lib" + "name": "bencher_device_test_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index d36fb44..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "device": true, - "run": true, - "tests": true -}
\ No newline at end of file |