diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:06:15 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:06:15 +0000 |
commit | 2abbba9c4b9af61931154faa0cbd02da69c6e573 (patch) | |
tree | 1a80d4806b4e2add407382a34601d66bc7c90d6a | |
parent | c72b20c81e3be9c93f8d87ba108c1ea1e3ca3926 (diff) | |
parent | 742cb525bef5a65be52eeb27a9c7e96a16448c50 (diff) | |
download | oid-registry-android13-d1-s3-release.tar.gz |
Snap for 8006021 from 742cb525bef5a65be52eeb27a9c7e96a16448c50 to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: I32dd3e937c618d50785e9cb7013978c11d869c3f
-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 |