diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:46 +0000 |
| commit | 2912f3ba5c27c72f8f20ff09d69a4e2b4aece169 (patch) | |
| tree | c9278f52ec614b19d52386d5b40b15a17d324a21 | |
| parent | faa80160cf9f78e8242762892c824169a49aaab4 (diff) | |
| parent | 71eec6d24c8b7edc71b709ebbe934e02d24efb05 (diff) | |
| download | x509-parser-2912f3ba5c27c72f8f20ff09d69a4e2b4aece169.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5015202c39 am: 71eec6d24c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-parser/+/1912800
Change-Id: Icfe2bd2ce2b832f8343b0faa08fd6825f905c1e2
| -rw-r--r-- | TEST_MAPPING | 11 | ||||
| -rw-r--r-- | cargo2android.json | 13 |
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 |