Snap for 8006021 from 3c4a8b90186b4923b318e7a2335230053141b8ef to tm-release
Change-Id: I11aef5cc818deaf3aea4def34c19417ea6200398
diff --git a/Android.bp b/Android.bp
index f21a06e..242f48a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 @@
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_defaults {
- name: "lru-cache_defaults",
- crate_name: "lru_cache",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: 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"],
+ 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",
+ ],
}
-
-// 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