aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:48 +0000
commitf9dd168e8101466a9a63d2f26772e66f69f6b535 (patch)
treec9278f52ec614b19d52386d5b40b15a17d324a21
parentc01944f898f9e9eb0bc75f0db5206376a27c8339 (diff)
parent2912f3ba5c27c72f8f20ff09d69a4e2b4aece169 (diff)
downloadx509-parser-f9dd168e8101466a9a63d2f26772e66f69f6b535.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5015202c39 am: 71eec6d24c am: 2912f3ba5c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-parser/+/1912800 Change-Id: Ic520c0bdd734899b1e351ee3656a6b55053cfac5
-rw-r--r--TEST_MAPPING11
-rw-r--r--cargo2android.json13
2 files changed, 17 insertions, 7 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 525e195..08b3cb2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,5 +10,16 @@
{
"name": "microdroid_manager_test"
}
+ ],
+ "presubmit-rust": [
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ }
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 5f001a6..c01fbda 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,7 @@
{
- "dependency-blocklist": [
- "data_encoding"
- ],
- "device": true,
- "run": true
-}
-
+ "dependency-blocklist": [
+ "data_encoding"
+ ],
+ "device": true,
+ "run": true
+} \ No newline at end of file