Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d1fefa5863 am: d9c5d7bd1f am: 024cc81079
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-hash/+/1912684
Change-Id: I9e0efe195aabf5632baefe0395193f509648a897
diff --git a/Android.bp b/Android.bp
index 0eb04b1..f2c723a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --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_rustc-hash_license"],
@@ -40,6 +41,8 @@
name: "librustc_hash",
host_supported: true,
crate_name: "rustc_hash",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.1.0",
srcs: ["src/lib.rs"],
edition: "2015",
features: [
@@ -47,26 +50,3 @@
"std",
],
}
-
-rust_defaults {
- name: "rustc-hash_defaults",
- crate_name: "rustc_hash",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2015",
- features: [
- "default",
- "std",
- ],
-}
-
-rust_test_host {
- name: "rustc-hash_host_test_src_lib",
- defaults: ["rustc-hash_defaults"],
-}
-
-rust_test {
- name: "rustc-hash_device_test_src_lib",
- defaults: ["rustc-hash_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 008a646..e4ec3b3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,24 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ }
+ ],
"presubmit": [
{
"name": "keystore2_test"
},
{
"name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
- },
- {
- "name": "libsqlite3_bindgen_test"
- },
- {
- "name": "rustc-hash_device_test_src_lib"
+ "name": "legacykeystore_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
