Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 1b1003a..a83fce2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --features=modern_sqlite,trace --add-toplevel-block cargo2android-extra-module.bp.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
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..b515003
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,6 @@
+{
+ "add-toplevel-block": "cargo2android-extra-module.bp",
+ "device": true,
+ "features": "modern_sqlite,trace",
+ "run": true
+}
\ No newline at end of file
