Regenerate Android.bp patch with correct context so it applies cleanly am: cfe23ac598
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/3118327
Change-Id: Ib702b2736fd9090e04b2940e8c410cd03c4a3c51
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 3478db5..4beeec7 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,10 +1,17 @@
diff --git a/Android.bp b/Android.bp
-index e15ddc5..4e63b88 100644
+index a1a223b..1b4784b 100644
--- a/Android.bp
+++ b/Android.bp
-@@ -53,11 +53,7 @@ rust_library {
+@@ -46,70 +46,64 @@ cc_library_headers {
+ }
+
+ rust_library {
+ name: "libquiche",
+ host_supported: true,
+ crate_name: "quiche",
+ cargo_env_compat: true,
cargo_pkg_version: "0.17.1",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2018",
- features: [
- "boringssl-vendored",
@@ -15,7 +22,9 @@
"liblazy_static",
"liblibc",
"liblibm",
-@@ -67,7 +63,8 @@ rust_library {
+ "liblog_rust",
+ "liboctets",
+ "libring",
"libslab",
"libsmallvec",
],
@@ -25,7 +34,12 @@
"libcrypto",
"libssl",
],
-@@ -80,7 +77,7 @@ rust_library {
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.resolv",
+ ],
+ product_available: true,
+ vendor_available: true,
min_sdk_version: "29",
}
@@ -34,9 +48,9 @@
name: "libquiche_ffi",
host_supported: true,
crate_name: "quiche",
-@@ -88,11 +85,7 @@ rust_ffi_shared {
+ cargo_env_compat: true,
cargo_pkg_version: "0.17.1",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2018",
- features: [
- "boringssl-vendored",
@@ -47,7 +61,9 @@
"liblazy_static",
"liblibc",
"liblibm",
-@@ -102,7 +95,8 @@ rust_ffi_shared {
+ "liblog_rust",
+ "liboctets",
+ "libring",
"libslab",
"libsmallvec",
],
@@ -57,7 +73,21 @@
"libcrypto",
"libssl",
],
-@@ -143,7 +137,7 @@ rust_test_host {
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.resolv",
+ ],
+ product_available: true,
+ vendor_available: true,
+ min_sdk_version: "29",
+@@ -136,21 +130,21 @@ rust_test_host {
+ "liblibc",
+ "liblibm",
+ "liblog_rust",
+ "libmio",
+ "liboctets",
+ "libring",
+ "libslab",
"libsmallvec",
"liburl",
],
@@ -66,7 +96,21 @@
"libcrypto",
"libssl",
],
-@@ -190,6 +184,7 @@ rust_test {
+ data: [
+ "examples/cert.crt",
+ "examples/cert.key",
+ "examples/cert-big.crt",
+ "examples/rootca.crt",
+ ],
+ }
+@@ -183,34 +177,31 @@ rust_test {
+ static_libs: [
+ "libcrypto_static",
+ "libssl",
+ ],
+ data: [
+ "examples/cert.crt",
+ "examples/cert.key",
"examples/cert-big.crt",
"examples/rootca.crt",
],
@@ -74,9 +118,12 @@
}
rust_library_rlib {
-@@ -200,10 +195,6 @@ 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"],
+ crate_root: "src/lib.rs",
edition: "2018",
- features: [
- "boringssl-vendored",
@@ -85,3 +132,10 @@
rustlibs: [
"liblazy_static",
"liblibc",
+ "liblibm",
+ "liblog_rust",
+ "liboctets",
+ "libring",
+ "libslab",
+ "libsmallvec",
+ ],
