diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:05:55 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:05:55 +0000 |
commit | c7c7e70f4129c4bbd77c51ca66a949a54b79ddb3 (patch) | |
tree | 4fb47bdc1cd0a28b6f9246448f17a6de5bc3b265 | |
parent | 3014f340ef05bbc5b15aa2eab9225bfb8698a527 (diff) | |
parent | 76712f208ca671a581a3503cbccd418f32c5e9ce (diff) | |
download | fallible-iterator-c7c7e70f4129c4bbd77c51ca66a949a54b79ddb3.tar.gz |
Snap for 8006021 from 76712f208ca671a581a3503cbccd418f32c5e9ce to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: I04900ee785b965dd0a596fc6a21faeea8227f3e2
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 29 insertions, 14 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --device --run --dependencies --tests. +// This file is generated by cargo2android.py --device --run --tests. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: [ @@ -38,12 +39,18 @@ license { ], } -rust_defaults { - name: "fallible-iterator_defaults", +rust_test { + name: "fallible-iterator_test_src_lib", + host_supported: true, crate_name: "fallible_iterator", + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -51,20 +58,12 @@ rust_defaults { ], } -rust_test_host { - name: "fallible-iterator_host_test_src_lib", - defaults: ["fallible-iterator_defaults"], -} - -rust_test { - name: "fallible-iterator_device_test_src_lib", - defaults: ["fallible-iterator_defaults"], -} - rust_library { name: "libfallible_iterator", host_supported: true, crate_name: "fallible_iterator", + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/TEST_MAPPING b/TEST_MAPPING index 9d4d72a..9df2505 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,18 @@ { "presubmit": [ { - "name": "fallible-iterator_device_test_src_lib" + "name": "fallible-iterator_test_src_lib" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + } + ], + "presubmit-rust": [ + { + "name": "fallible-iterator_test_src_lib" }, { "name": "keystore2_test" 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 |