Snap for 8005954 from 7132b01d1e71be9dbca5a716c8e06ab1f59e0038 to sdk-release
Change-Id: I00e81b44d04c742904c86394d5c27971dbc79f3c
diff --git a/Android.bp b/Android.bp
index 1b78f58..216642a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --features=alloc,std.
+// 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 f9893f6..0b9e785 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,16 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/oid-registry"
+ },
+ {
+ "path": "external/rust/crates/rusticata-macros"
+ }
+ ],
"presubmit": [
{
"name": "keystore2_test"
@@ -14,19 +25,24 @@
"name": "libapkverify.test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "microdroid_manager_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
},
{
"name": "microdroid_manager_test"
- },
- {
- "name": "oid-registry_device_test_src_lib"
- },
- {
- "name": "rusticata-macros_device_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..5fb7e33
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "features": "alloc,std",
+ "run": true
+}
\ No newline at end of file
