diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:51 +0000 |
| commit | 6c59619546a7bacd148e4eee174e447f503f9e6a (patch) | |
| tree | 1a80d4806b4e2add407382a34601d66bc7c90d6a | |
| parent | d43c29fbcee56c8631d2993e97367d32d967725d (diff) | |
| parent | 6f2675cf48170a669b6f21f3615972422f195f01 (diff) | |
| download | oid-registry-6c59619546a7bacd148e4eee174e447f503f9e6a.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f0688e4a35 am: 6f2675cf48
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oid-registry/+/1912611
Change-Id: Icebeb3f085b9fc9a033b495f0f35d94da3107e3e
| -rw-r--r-- | Android.bp | 25 | ||||
| -rw-r--r-- | TEST_MAPPING | 16 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
3 files changed, 24 insertions, 19 deletions
@@ -71,17 +71,21 @@ rust_library { ], } -rust_defaults { - name: "oid-registry_test_defaults", +rust_test { + name: "oid-registry_test_src_lib", + host_supported: true, crate_name: "oid_registry", + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", srcs: [ "src/lib.rs", ":copy_oid-registry_build_out", ], - cargo_env_compat: true, - cargo_pkg_version: "0.2.0", test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "crypto", @@ -98,16 +102,3 @@ rust_defaults { "libder_parser", ], } - -rust_test_host { - name: "oid-registry_host_test_src_lib", - defaults: ["oid-registry_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "oid-registry_device_test_src_lib", - defaults: ["oid-registry_test_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 587e8a5..ecf0f4a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -11,7 +11,21 @@ "name": "microdroid_manager_test" }, { - "name": "oid-registry_device_test_src_lib" + "name": "oid-registry_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "libapkverify.integration_test" + }, + { + "name": "libapkverify.test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "oid-registry_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json index 69d8a6b..183bd42 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,4 +4,4 @@ "features": "crypto,x509", "run": true, "tests": true -} +}
\ No newline at end of file |