Description: avoid android-only crates
Author: Jonas Smedegaard <dr@jones.dk>
Forwarded: not-needed
Last-Update: 2025-01-30
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,5 @@
 [workspace]
 members = [
-    "android-release-support",
     "rustls-platform-verifier",
 ]
 resolver = "2"
--- a/rustls-platform-verifier/Cargo.toml
+++ b/rustls-platform-verifier/Cargo.toml
@@ -11,40 +11,25 @@
 
 [lib]
 name = "rustls_platform_verifier"
-# Note: The `cdylib` specification is for testing only. The shared library
-# is not expected to have a stable API.
-crate-type = ["cdylib", "rlib"]
+crate-type = ["rlib"]
 
 [features]
-# Enables a C interface to use for testing where `cargo` can't be used.
-# This feature is not stable, nor is the interface exported when it is enabled.
-# Do not rely on this or use it in production.
-ffi-testing = ["android_logger", "rustls/ring"]
 # Enables APIs that expose lower-level verifier types for debugging purposes.
 dbg = []
 # Enables `log::debug` base64-encoded logging of all end-entity certificates processed
 # by the platform's verifier.
 cert-logging = ["base64"]
-# Used for nicely documenting the Android-specific APIs. This feature is not stable.
-docsrs = ["jni"]
 
 [dependencies]
 rustls = { version = "0.23.27", default-features = false, features = ["std"] }
 log = { version = "0.4" }
 base64 = { version = "0.22", optional = true } # Only used when the `cert-logging` feature is enabled.
-jni = { version = "0.21", default-features = false, optional = true } # Only used during doc generation
 once_cell = "1.9"
 
-[target.'cfg(all(unix, not(target_os = "android"), not(target_vendor = "apple"), not(target_arch = "wasm32")))'.dependencies]
+[target.'cfg(all(unix, not(target_vendor = "apple"), not(target_arch = "wasm32")))'.dependencies]
 rustls-native-certs = "0.8"
 webpki = { package = "rustls-webpki", version = "0.103", default-features = false }
 
-[target.'cfg(target_os = "android")'.dependencies]
-rustls-platform-verifier-android = { path = "../android-release-support", version = "0.1.0" }
-jni = { version = "0.21", default-features = false }
-webpki = { package = "rustls-webpki", version = "0.103", default-features = false }
-android_logger = { version = "0.15", optional = true } # Only used during testing.
-
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 webpki = { package = "rustls-webpki", version = "0.103", default-features = false }
 webpki-root-certs = "0.26"