From 3795af99b6e5949d76eb70ee552e1bc9b0b2a8ec Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 16 Aug 2021 16:39:51 -0700 Subject: Fix rustdoc build. The rustdoc for this crate fails if the validate feature is not enabled. Let's enable it temporarily to fix that. Note that the other changes to the Android.bp are due to unrelated changes to cargo2android.py that shouldn't affect anything. Test: m rustdoc Change-Id: I8bcc97dda4dcf4684366b7f7ebed32eb2e416cb8 --- Android.bp | 9 ++++++--- cargo2android.json | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Android.bp b/Android.bp index 91bde0f..62fc34d 100644 --- a/Android.bp +++ b/Android.bp @@ -1,8 +1,6 @@ // This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. - - package { default_applicable_licenses: ["external_rust_crates_x509-parser_license"], } @@ -43,9 +41,14 @@ rust_library { name: "libx509_parser", host_supported: true, crate_name: "x509_parser", + cargo_env_compat: true, + cargo_pkg_version: "0.10.0", srcs: ["src/lib.rs"], edition: "2018", - features: ["default"], + features: [ + "default", + "validate", + ], rustlibs: [ "libbase64_rust", "libchrono", diff --git a/cargo2android.json b/cargo2android.json index 5f001a6..e24b32a 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -3,6 +3,7 @@ "data_encoding" ], "device": true, + "features": "default,validate", "run": true } -- cgit v1.2.3