diff options
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | TEST_MAPPING | 51 | ||||
| -rw-r--r-- | patches/lint-rename.patch | 31 | ||||
| -rw-r--r-- | src/untrusted.rs | 2 |
4 files changed, 37 insertions, 54 deletions
@@ -33,6 +33,8 @@ rust_library { "com.android.resolv", "com.android.virt", ], + product_available: true, + vendor_available: true, min_sdk_version: "29", } @@ -54,8 +56,3 @@ rust_test { "libuntrusted", ], } - -// Errors when listing tests: -// error: lint `non_autolinks` has been renamed to `rustdoc::bare_urls` -// error: aborting due to previous error -// error: test failed, to rerun pass '--doc' diff --git a/TEST_MAPPING b/TEST_MAPPING index ca1b239..eb1c219 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -9,64 +9,19 @@ }, { "path": "external/rust/crates/webpki" + }, + { + "path": "packages/modules/DnsResolver" } ], "presubmit": [ { - "name": "apkdmverity.test" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "doh_unit_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "libidsig.test" - }, - { - "name": "microdroid_manager_test" - }, - { "name": "untrusted_test_tests_tests" - }, - { - "name": "virtualizationservice_device_test" } ], "presubmit-rust": [ { - "name": "apkdmverity.test" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "doh_unit_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "libidsig.test" - }, - { - "name": "microdroid_manager_test" - }, - { "name": "untrusted_test_tests_tests" - }, - { - "name": "virtualizationservice_device_test" } ] } diff --git a/patches/lint-rename.patch b/patches/lint-rename.patch new file mode 100644 index 0000000..d28acc7 --- /dev/null +++ b/patches/lint-rename.patch @@ -0,0 +1,31 @@ +From 6f300ba0a9bc047c08c1bc63bdb831d56479815b Mon Sep 17 00:00:00 2001 +From: Chris Wailes <chriswailes@google.com> +Date: Fri, 10 Feb 2023 12:12:30 -0800 +Subject: [PATCH] Update crate source to work with Rust 1.66.1 + +This CL changes the name of a lint in an annotation to allow rustdoc to +successfully process the crate. + +Test: RUST_PREBUILT_VERSION="1.66.1" m rustdoc +Bug: 263153841 +Change-Id: If213ca89d296bb06d3bdeadb18b2c5b31ff36a2a +--- + src/untrusted.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/untrusted.rs b/src/untrusted.rs +index a9d7f7b..5071fdd 100644 +--- a/src/untrusted.rs ++++ b/src/untrusted.rs +@@ -102,7 +102,7 @@ + )] + // ANDROID: This lint is included in warnings and thus forbidden, but this version of the library + // is not compatible with it. +-#![allow(non_autolinks)] ++#![allow(rustdoc::bare_urls)] + #![no_std] + + // ANDROID: Unconditionally use std to allow building as a dylib. +-- +2.39.1.581.gbfd45094c4-goog + diff --git a/src/untrusted.rs b/src/untrusted.rs index a9d7f7b..5071fdd 100644 --- a/src/untrusted.rs +++ b/src/untrusted.rs @@ -102,7 +102,7 @@ )] // ANDROID: This lint is included in warnings and thus forbidden, but this version of the library // is not compatible with it. -#![allow(non_autolinks)] +#![allow(rustdoc::bare_urls)] #![no_std] // ANDROID: Unconditionally use std to allow building as a dylib. |