diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:20 +0000 |
| commit | ca61606cba3c945b7d9210d41240b9d30da231c4 (patch) | |
| tree | 3547624fc1bb0a71350ed06a100ae37654e76022 | |
| parent | 38ffa5c7118b9a3093490dcb085b88a2769c5423 (diff) | |
| parent | b53aecc3bdbef38d4179a987b8f946f77266b6a0 (diff) | |
| download | peeking_take_while-ca61606cba3c945b7d9210d41240b9d30da231c4.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4f5cf36e0a am: b53aecc3bd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/peeking_take_while/+/1912006
Change-Id: I19c4c65c218cc40167d87bec950f7ed2c9e04974
| -rw-r--r-- | Android.bp | 23 | ||||
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 24 insertions, 17 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -50,27 +50,18 @@ rust_library { edition: "2018", } -rust_defaults { - name: "peeking_take_while_test_defaults", - crate_name: "peeking_take_while", +rust_test { + name: "peeking_take_while_test_src_lib", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "peeking_take_while", cargo_env_compat: true, cargo_pkg_version: "1.0.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "peeking_take_while_host_test_src_lib", - defaults: ["peeking_take_while_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "peeking_take_while_device_test_src_lib", - defaults: ["peeking_take_while_test_defaults"], + edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index d23e52b..f9ce301 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -13,7 +13,18 @@ "name": "legacykeystore_test" }, { - "name": "peeking_take_while_device_test_src_lib" + "name": "peeking_take_while_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "peeking_take_while_test_src_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 |