1 files changed, 93 insertions, 47 deletions

diff --git a/Android.bp b/Android.bp
index ecbb83f..ec19374 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -43,19 +43,14 @@ cc_library_headers {
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "libquiche_defaults",
-    stem: "libquiche",
+rust_library {
+    name: "libquiche",
     host_supported: true,
     crate_name: "quiche",
     cargo_env_compat: true,
+    cargo_pkg_version: "0.17.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    features: [
-        "boringssl",
-        "default",
-    ],
-    // Link all crates statically to create a self-contained .so library.
     rlibs: [
         "liblazy_static",
         "liblibc",
@@ -67,17 +62,38 @@ rust_defaults {
         "libsmallvec",
     ],
     prefer_rlib: true,
-    // For DnsResolver (Mainline module introduced in Q).
+    shared_libs: [
+        "libcrypto",
+        "libssl",
+    ],
     apex_available: [
         "//apex_available:platform",
         "com.android.resolv",
     ],
+    product_available: true,
+    vendor_available: true,
     min_sdk_version: "29",
 }
 
 rust_ffi {
     name: "libquiche_ffi",
-    defaults: ["libquiche_defaults"],
+    host_supported: true,
+    crate_name: "quiche",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.17.1",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    rlibs: [
+        "liblazy_static",
+        "liblibc",
+        "liblibm",
+        "liblog_rust",
+        "liboctets",
+        "libring",
+        "libslab",
+        "libsmallvec",
+    ],
+    prefer_rlib: true,
     shared_libs: [
         "libcrypto",
         "libssl",
@@ -86,38 +102,56 @@ rust_ffi {
         "//apex_available:platform",
         "com.android.resolv",
     ],
+    product_available: true,
+    vendor_available: true,
     min_sdk_version: "29",
 }
 
-rust_library {
-    name: "libquiche",
-    defaults: ["libquiche_defaults"],
+rust_test_host {
+    name: "quiche_host_test_src_lib",
+    crate_name: "quiche",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.17.1",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2018",
+    features: [
+        "boringssl-vendored",
+        "default",
+    ],
+    rustlibs: [
+        "liblazy_static",
+        "liblibc",
+        "liblibm",
+        "liblog_rust",
+        "libmio",
+        "liboctets",
+        "libring",
+        "libslab",
+        "libsmallvec",
+        "liburl",
+    ],
     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",
-    ],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.resolv",
+    data: [
+        "examples/cert.crt",
+        "examples/cert.key",
+        "examples/cert-big.crt",
+        "examples/rootca.crt",
     ],
-    min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "quiche_test_defaults",
+rust_test {
+    name: "quiche_device_test_src_lib",
     crate_name: "quiche",
     cargo_env_compat: true,
+    cargo_pkg_version: "0.17.1",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -138,6 +172,10 @@ rust_defaults {
         "libsmallvec",
         "liburl",
     ],
+    static_libs: [
+        "libcrypto_static",
+        "libssl",
+    ],
     data: [
         "examples/cert.crt",
         "examples/cert.key",
@@ -146,25 +184,33 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "quiche_host_test_src_lib",
-    defaults: ["quiche_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-    shared_libs: [
-        "libcrypto",
-        "libssl",
+rust_library_rlib {
+    name: "libquiche_static",
+    host_supported: true,
+    crate_name: "quiche",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.17.1",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    rustlibs: [
+        "liblazy_static",
+        "liblibc",
+        "liblibm",
+        "liblog_rust",
+        "liboctets",
+        "libring",
+        "libslab",
+        "libsmallvec",
     ],
-}
-
-rust_test {
-    name: "quiche_device_test_src_lib",
-    defaults: ["quiche_test_defaults"],
-    // To run this test in R platform, it's required to statically link
-    // libcrypto and libssl.
     static_libs: [
         "libcrypto_static",
         "libssl",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.resolv",
+    ],
+    product_available: true,
+    vendor_available: true,
+    min_sdk_version: "29",
 }