Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: Ibc403c8ea5f0d5167c012bcedd352b3a1bda15b7
diff --git a/Android.bp b/Android.bp
index c5283c9..27d6b4c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --dependencies --patch=patches/Android.bp.diff.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,6 +42,8 @@
// has rustc warnings
host_supported: true,
crate_name: "ahash",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.4",
srcs: ["src/lib.rs"],
edition: "2018",
arch: {
@@ -55,7 +57,6 @@
features: [
"default",
"runtime-rng",
- "specialize",
"std",
],
rustlibs: [
@@ -63,10 +64,3 @@
"libonce_cell",
],
}
-
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
-// getrandom-0.2.3
-// libc-0.2.97 "default,std"
-// once_cell-1.8.0 "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..0f12cfd
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "patch": "patches/Android.bp.diff",
+ "run": true
+}
\ No newline at end of file
