Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 366d02e..be42217 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 @@
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",
- crate_name: "linked_hash_map",
- 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",
+ name: "linked-hash-map_test_tests_test",
+ host_supported: true,
crate_name: "linked_hash_map",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.5.4",
+ srcs: ["tests/test.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: 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.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/lru-cache"
+ }
+ ],
"presubmit": [
{
- "name": "linked-hash-map_device_test_src_lib"
- },
+ "name": "linked-hash-map_test_tests_test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "linked-hash-map_device_test_tests_heapsize"
- },
- {
- "name": "linked-hash-map_device_test_tests_serde"
- },
- {
- "name": "linked-hash-map_device_test_tests_test"
- },
- {
- "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
