Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: I24d99bdb22e05344ead547d19d3a851ad66ba608
diff --git a/Android.bp b/Android.bp
index 1a194ac..260ac53 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -41,18 +41,11 @@
name: "libhashlink",
host_supported: true,
crate_name: "hashlink",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.0",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
"libhashbrown",
],
}
-
-// dependent_library ["feature_list"]
-// ahash-0.7.2 "folded_multiply,runtime-rng,specialize"
-// cfg-if-1.0.0
-// getrandom-0.2.2
-// hashbrown-0.11.2 "ahash,default,inline-more"
-// libc-0.2.94
-// once_cell-1.7.2 "alloc,race,unstable"
-// version_check-0.9.3
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 48ee89d..91f37bf 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,5 +7,13 @@
{
"name": "legacykeystore_test"
}
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ }
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+ "device": true,
+ "run": true
+}
\ No newline at end of file
