diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-08-24 21:09:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-24 21:09:49 +0000 |
| commit | 2cebbfdf521586aad48720d5c2884f6c15299906 (patch) | |
| tree | db175720d64dec30fc41fab013c687c0a878bcb5 | |
| parent | 6a57afccfa5831779f75b81f178e32a63629de93 (diff) | |
| parent | 8b33734b68b5f8d706c6ef6b80eee13acdbdf45b (diff) | |
| download | fallible-streaming-iterator-2cebbfdf521586aad48720d5c2884f6c15299906.tar.gz | |
Merge "Fix incorrect flag in Android.bp and migrate to config file" am: 059879ce28 am: c4d1fab578 am: 8fcc0a2fa4 am: 01295d5855 am: 8b33734b68
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fallible-streaming-iterator/+/1806614
Change-Id: Ibc71483687fe14397ff118de419295fe354b0e9a
| -rw-r--r-- | Android.bp | 22 | ||||
| -rw-r--r-- | cargo2android.json | 6 |
2 files changed, 18 insertions, 10 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --device --run --dependencies --test --features=std. +// 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: [ @@ -39,26 +40,27 @@ license { } rust_defaults { - name: "fallible-streaming-iterator_defaults", + name: "fallible-streaming-iterator_test_defaults", crate_name: "fallible_streaming_iterator", // has rustc warnings srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", - features: [ - "std", - ], + features: ["std"], } rust_test_host { name: "fallible-streaming-iterator_host_test_src_lib", - defaults: ["fallible-streaming-iterator_defaults"], + defaults: ["fallible-streaming-iterator_test_defaults"], + test_options: { + unit_test: true, + }, } rust_test { name: "fallible-streaming-iterator_device_test_src_lib", - defaults: ["fallible-streaming-iterator_defaults"], + defaults: ["fallible-streaming-iterator_test_defaults"], } rust_library { @@ -66,9 +68,9 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "fallible_streaming_iterator", + cargo_env_compat: true, + cargo_pkg_version: "0.1.9", srcs: ["src/lib.rs"], edition: "2015", - features: [ - "std", - ], + features: ["std"], } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..fba20cf --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,6 @@ +{ + "device": true, + "features": "std", + "run": true, + "tests": true +}
\ No newline at end of file |