summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 15:28:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-12-15 15:28:00 +0000
commit9fe9eaa843bc45e69970f4edf530eb90e72384ee (patch)
treeab9eb629df900c6df3cfe845466f12b168658c83
parent59e2e864bf56e8aa011bd2775984ef1c34b895fa (diff)
parent0a628a9b5cac9fadeed8c1ff29486ed5f37392a2 (diff)
downloadder-oid-macro-9fe9eaa843bc45e69970f4edf530eb90e72384ee.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
-rw-r--r--TEST_MAPPING15
-rw-r--r--cargo2android.json7
2 files changed, 17 insertions, 5 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 587e8a5..c758e89 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/oid-registry"
+ }
+ ],
"presubmit": [
{
"name": "libapkverify.integration_test"
@@ -9,9 +14,17 @@
},
{
"name": "microdroid_manager_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "libapkverify.integration_test"
},
{
- "name": "oid-registry_device_test_src_lib"
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "microdroid_manager_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 50bf622..bf78496 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,4 @@
{
- "device": true,
- "run": true
-}
-
+ "device": true,
+ "run": true
+} \ No newline at end of file