diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:29 +0000 |
| commit | 1a02a4b742f88506e932277e46c756e7ca330954 (patch) | |
| tree | 673a689a788b34fde45df0c3807ade9b4f1eb333 | |
| parent | cf533d4bc553a9b821d4fb41543f4e6ee49c80c7 (diff) | |
| parent | cde1e4e04d730c9c99bc9e29d30d2d595e4c7081 (diff) | |
| download | lru-cache-1a02a4b742f88506e932277e46c756e7ca330954.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: eac7e9dd94 am: cde1e4e04d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lru-cache/+/1912625
Change-Id: I1b6f06be5aeafb0997aaaf64e54b182fe5c2db04
| -rw-r--r-- | Android.bp | 28 | ||||
| -rw-r--r-- | TEST_MAPPING | 7 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 23 insertions, 17 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --device --run --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_lru-cache_license"], @@ -40,6 +41,8 @@ rust_library { name: "liblru_cache", host_supported: true, crate_name: "lru_cache", + cargo_env_compat: true, + cargo_pkg_version: "0.1.2", srcs: ["src/lib.rs"], edition: "2015", rustlibs: [ @@ -47,27 +50,20 @@ rust_library { ], } -rust_defaults { - name: "lru-cache_defaults", +rust_test { + name: "lru-cache_test_src_lib", + host_supported: true, crate_name: "lru_cache", + cargo_env_compat: true, + cargo_pkg_version: "0.1.2", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", rustlibs: [ "liblinked_hash_map", ], } - -rust_test_host { - name: "lru-cache_host_test_src_lib", - defaults: ["lru-cache_defaults"], -} - -rust_test { - name: "lru-cache_device_test_src_lib", - defaults: ["lru-cache_defaults"], -} - -// dependent_library ["feature_list"] -// linked-hash-map-0.5.3 diff --git a/TEST_MAPPING b/TEST_MAPPING index 82a1b4a..e341227 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,12 @@ { "presubmit": [ { - "name": "lru-cache_device_test_src_lib" + "name": "lru-cache_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "lru-cache_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 |