1 files changed, 28 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 981eb96..578cc68 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch.
+// 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_quiche_license"],
@@ -62,10 +63,6 @@ rust_defaults {
         "libring",
     ],
     prefer_rlib: true,
-    shared_libs: [
-        "libcrypto",
-        "libssl",
-    ],
     // For DnsResolver (Mainline module introduced in Q).
     apex_available: [
         "//apex_available:platform",
@@ -77,11 +74,30 @@ rust_defaults {
 rust_ffi {
     name: "libquiche_ffi",
     defaults: ["libquiche_defaults"],
+    shared_libs: [
+        "libcrypto",
+        "libssl",
+    ],
 }
 
 rust_library {
     name: "libquiche",
     defaults: ["libquiche_defaults"],
+    shared_libs: [
+        "libcrypto",
+        "libssl",
+    ],
+}
+
+// This target is used by doh_unit_test to prevent compatibility issues
+// because doh_unit_test needs to be run on the R platform.
+rust_library_rlib {
+    name: "libquiche_static",
+    defaults: ["libquiche_defaults"],
+    static_libs: [
+        "libcrypto_static",
+        "libssl",
+    ],
 }
 
 rust_defaults {
@@ -136,27 +152,27 @@ rust_test {
 }
 
 // dependent_library ["feature_list"]
-//   cc-1.0.66
+//   cc-1.0.67
 //   cfg-if-0.1.10
 //   cfg-if-1.0.0
 //   cmake-0.1.45
 //   idna-0.1.5
 //   iovec-0.1.4
 //   lazy_static-1.4.0
-//   libc-0.2.85 "default,std"
+//   libc-0.2.94 "default,std"
 //   libm-0.2.1 "default"
 //   log-0.4.14 "std"
 //   matches-0.1.8
 //   mio-0.6.23 "default,with-deprecated"
 //   net2-0.2.37 "default,duration"
-//   once_cell-1.5.2 "alloc,std"
+//   once_cell-1.7.2 "alloc,race,std"
 //   percent-encoding-1.0.1
 //   ring-0.16.20 "alloc,default,dev_urandom_fallback,once_cell"
-//   slab-0.4.2
+//   slab-0.4.3 "default,std"
 //   spin-0.5.2
-//   tinyvec-1.1.1 "alloc,default,tinyvec_macros"
+//   tinyvec-1.2.0 "alloc,default,tinyvec_macros"
 //   tinyvec_macros-0.1.0
-//   unicode-bidi-0.3.4 "default"
-//   unicode-normalization-0.1.16 "default,std"
+//   unicode-bidi-0.3.5 "default"
+//   unicode-normalization-0.1.17 "default,std"
 //   untrusted-0.7.1
 //   url-1.7.2