diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:14 +0000 |
| commit | f00f96a9b9995b391e838a247ffe0bff053d6220 (patch) | |
| tree | ab9eb629df900c6df3cfe845466f12b168658c83 | |
| parent | b42d7bec6bb8247804fb4b33441cf414e4c6e15f (diff) | |
| parent | 6738a42e354ee28d4cc0cd7abb702222c51daf06 (diff) | |
| download | der-oid-macro-f00f96a9b9995b391e838a247ffe0bff053d6220.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9fe9eaa843 am: 48df0e42d6 am: 6738a42e35
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-oid-macro/+/1912639
Change-Id: Id5f0e8594eb0b3e500c80e08179c8c881aa12a53
| -rw-r--r-- | TEST_MAPPING | 15 | ||||
| -rw-r--r-- | cargo2android.json | 7 |
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 |