diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:42:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:42:59 +0000 |
commit | 7114d79a99f8ae5bd8a4d67061fde789701c8cd3 (patch) | |
tree | fa12a2b15e145df09ef70c2946b577f48943bd92 | |
parent | 87b5cb6b6e15e9d3fbc07fa66ba842a9eca03330 (diff) | |
parent | b35d5c5d3f002c5c49ea6a7f3f33437675431961 (diff) | |
download | linked-hash-map-7114d79a99f8ae5bd8a4d67061fde789701c8cd3.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f6a45ddf56 am: b35d5c5d3f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/linked-hash-map/+/1912606
Change-Id: I4e8d42ff1eb6b4337f61da98f9858c770811b752
-rw-r--r-- | Android.bp | 76 | ||||
-rw-r--r-- | TEST_MAPPING | 22 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 24 insertions, 79 deletions
@@ -1,4 +1,4 @@ -// 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 { @@ -43,84 +43,26 @@ rust_library { name: "liblinked_hash_map", host_supported: true, crate_name: "linked_hash_map", + cargo_env_compat: true, + cargo_pkg_version: "0.5.4", srcs: ["src/lib.rs"], edition: "2015", } -rust_defaults { - name: "linked-hash-map_defaults", +rust_test { + name: "linked-hash-map_test_tests_test", + host_supported: true, crate_name: "linked_hash_map", - srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "0.5.4", + srcs: ["tests/test.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "linked-hash-map_host_test_src_lib", - defaults: ["linked-hash-map_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "linked-hash-map_device_test_src_lib", - defaults: ["linked-hash-map_defaults"], -} - -rust_defaults { - name: "linked-hash-map_defaults_linked_hash_map", - crate_name: "linked_hash_map", - test_suites: ["general-tests"], - auto_gen_config: true, edition: "2015", rustlibs: [ "liblinked_hash_map", ], } - -rust_test_host { - name: "linked-hash-map_host_test_tests_heapsize", - defaults: ["linked-hash-map_defaults_linked_hash_map"], - srcs: ["tests/heapsize.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "linked-hash-map_device_test_tests_heapsize", - defaults: ["linked-hash-map_defaults_linked_hash_map"], - srcs: ["tests/heapsize.rs"], -} - -rust_test_host { - name: "linked-hash-map_host_test_tests_serde", - defaults: ["linked-hash-map_defaults_linked_hash_map"], - srcs: ["tests/serde.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "linked-hash-map_device_test_tests_serde", - defaults: ["linked-hash-map_defaults_linked_hash_map"], - srcs: ["tests/serde.rs"], -} - -rust_test_host { - name: "linked-hash-map_host_test_tests_test", - defaults: ["linked-hash-map_defaults_linked_hash_map"], - srcs: ["tests/test.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "linked-hash-map_device_test_tests_test", - defaults: ["linked-hash-map_defaults_linked_hash_map"], - srcs: ["tests/test.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index fb57622..2c5b7a8 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,18 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "linked-hash-map_device_test_src_lib" - }, - { - "name": "linked-hash-map_device_test_tests_heapsize" - }, + "imports": [ { - "name": "linked-hash-map_device_test_tests_serde" - }, + "path": "external/rust/crates/lru-cache" + } + ], + "presubmit": [ { - "name": "linked-hash-map_device_test_tests_test" - }, + "name": "linked-hash-map_test_tests_test" + } + ], + "presubmit-rust": [ { - "name": "lru-cache_device_test_src_lib" + "name": "linked-hash-map_test_tests_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 |