• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/Android.bp b/Android.bp
2index a1a223b..1b4784b 100644
3--- a/Android.bp
4+++ b/Android.bp
5@@ -46,70 +46,64 @@ cc_library_headers {
6 }
7
8 rust_library {
9     name: "libquiche",
10     host_supported: true,
11     crate_name: "quiche",
12     cargo_env_compat: true,
13     cargo_pkg_version: "0.17.1",
14     crate_root: "src/lib.rs",
15     edition: "2018",
16-    features: [
17-        "boringssl-vendored",
18-        "default",
19-    ],
20-    rustlibs: [
21+    rlibs: [
22         "liblazy_static",
23         "liblibc",
24         "liblibm",
25         "liblog_rust",
26         "liboctets",
27         "libring",
28         "libslab",
29         "libsmallvec",
30     ],
31-    static_libs: [
32+    prefer_rlib: true,
33+    shared_libs: [
34         "libcrypto",
35         "libssl",
36     ],
37     apex_available: [
38         "//apex_available:platform",
39         "com.android.resolv",
40     ],
41     product_available: true,
42     vendor_available: true,
43     min_sdk_version: "29",
44 }
45
46-rust_ffi_shared {
47+rust_ffi {
48     name: "libquiche_ffi",
49     host_supported: true,
50     crate_name: "quiche",
51     cargo_env_compat: true,
52     cargo_pkg_version: "0.17.1",
53     crate_root: "src/lib.rs",
54     edition: "2018",
55-    features: [
56-        "boringssl-vendored",
57-        "default",
58-    ],
59-    rustlibs: [
60+    rlibs: [
61         "liblazy_static",
62         "liblibc",
63         "liblibm",
64         "liblog_rust",
65         "liboctets",
66         "libring",
67         "libslab",
68         "libsmallvec",
69     ],
70-    static_libs: [
71+    prefer_rlib: true,
72+    shared_libs: [
73         "libcrypto",
74         "libssl",
75     ],
76     apex_available: [
77         "//apex_available:platform",
78         "com.android.resolv",
79     ],
80     product_available: true,
81     vendor_available: true,
82     min_sdk_version: "29",
83@@ -136,21 +130,21 @@ rust_test_host {
84         "liblibc",
85         "liblibm",
86         "liblog_rust",
87         "libmio",
88         "liboctets",
89         "libring",
90         "libslab",
91         "libsmallvec",
92         "liburl",
93     ],
94-    static_libs: [
95+    shared_libs: [
96         "libcrypto",
97         "libssl",
98     ],
99     data: [
100         "examples/cert.crt",
101         "examples/cert.key",
102         "examples/cert-big.crt",
103         "examples/rootca.crt",
104     ],
105 }
106@@ -183,34 +177,31 @@ rust_test {
107     static_libs: [
108         "libcrypto_static",
109         "libssl",
110     ],
111     data: [
112         "examples/cert.crt",
113         "examples/cert.key",
114         "examples/cert-big.crt",
115         "examples/rootca.crt",
116     ],
117+    shared_libs: ["libc++"],
118 }
119
120 rust_library_rlib {
121     name: "libquiche_static",
122     host_supported: true,
123     crate_name: "quiche",
124     cargo_env_compat: true,
125     cargo_pkg_version: "0.17.1",
126     crate_root: "src/lib.rs",
127     edition: "2018",
128-    features: [
129-        "boringssl-vendored",
130-        "default",
131-    ],
132     rustlibs: [
133         "liblazy_static",
134         "liblibc",
135         "liblibm",
136         "liblog_rust",
137         "liboctets",
138         "libring",
139         "libslab",
140         "libsmallvec",
141     ],
142