Snap for 8189469 from 914303f42108aeb261f790147ec67b0b076a9d92 to tm-frc-tzdata4-release
Change-Id: Icde3a7d07caf9c98996df0852da294a507e1e2cf
diff --git a/Android.bp b/Android.bp
index be42217..ef47958 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --device --run --dependencies --test.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -43,26 +43,84 @@
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_test {
- name: "linked-hash-map_test_tests_test",
- host_supported: true,
+rust_defaults {
+ name: "linked-hash-map_defaults",
crate_name: "linked_hash_map",
- cargo_env_compat: true,
- cargo_pkg_version: "0.5.4",
- srcs: ["tests/test.rs"],
+ srcs: ["src/lib.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 2c5b7a8..d694cb4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,18 +1,20 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "imports": [
- {
- "path": "external/rust/crates/lru-cache"
- }
- ],
"presubmit": [
{
- "name": "linked-hash-map_test_tests_test"
- }
- ],
- "presubmit-rust": [
+ "name": "linked-hash-map_device_test_src_lib"
+ },
{
- "name": "linked-hash-map_test_tests_test"
+ "name": "lru-cache_device_test_src_lib"
+ },
+ {
+ "name": "linked-hash-map_device_test_tests_test"
+ },
+ {
+ "name": "linked-hash-map_device_test_tests_serde"
+ },
+ {
+ "name": "linked-hash-map_device_test_tests_heapsize"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-}
\ No newline at end of file
