diff options
Diffstat (limited to 'patches/Android.bp.patch')
| -rw-r--r-- | patches/Android.bp.patch | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index f77d468..a1b4bf2 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,5 +1,5 @@ diff --git a/Android.bp b/Android.bp -index 38dd21b..bc3ee19 100644 +index 884af0e..ecbb83f 100644 --- a/Android.bp +++ b/Android.bp @@ -43,8 +43,8 @@ cc_library_headers { @@ -27,9 +27,9 @@ index 38dd21b..bc3ee19 100644 "liblazy_static", "liblibc", "liblibm", -@@ -63,10 +64,8 @@ rust_ffi_shared { - "liboctets", - "libring", +@@ -65,41 +66,19 @@ rust_ffi_shared { + "libslab", + "libsmallvec", ], - static_libs: [ - "libcrypto", @@ -40,7 +40,9 @@ index 38dd21b..bc3ee19 100644 apex_available: [ "//apex_available:platform", "com.android.resolv", -@@ -74,26 +73,10 @@ rust_ffi_shared { + ], +- product_available: true, +- vendor_available: true, min_sdk_version: "29", } @@ -62,6 +64,8 @@ index 38dd21b..bc3ee19 100644 - "liblog_rust", - "liboctets", - "libring", +- "libslab", +- "libsmallvec", - ], - static_libs: [ +rust_ffi { @@ -71,7 +75,12 @@ index 38dd21b..bc3ee19 100644 "libcrypto", "libssl", ], -@@ -104,28 +87,22 @@ rust_library { +@@ -107,57 +86,41 @@ rust_library { + "//apex_available:platform", + "com.android.resolv", + ], +- product_available: true, +- vendor_available: true, min_sdk_version: "29", } @@ -94,6 +103,8 @@ index 38dd21b..bc3ee19 100644 - "liblog_rust", - "liboctets", - "libring", +- "libslab", +- "libsmallvec", +rust_library { + name: "libquiche", + defaults: ["libquiche_defaults"], @@ -114,7 +125,11 @@ index 38dd21b..bc3ee19 100644 "libssl", ], apex_available: [ -@@ -135,17 +112,13 @@ rust_ffi_static { + "//apex_available:platform", + "com.android.resolv", + ], +- product_available: true, +- vendor_available: true, min_sdk_version: "29", } @@ -134,8 +149,8 @@ index 38dd21b..bc3ee19 100644 edition: "2018", features: [ "boringssl-vendored", -@@ -161,10 +134,6 @@ rust_test { - "libring", +@@ -175,10 +138,6 @@ rust_test { + "libsmallvec", "liburl", ], - static_libs: [ @@ -145,7 +160,7 @@ index 38dd21b..bc3ee19 100644 data: [ "examples/cert.crt", "examples/cert.key", -@@ -172,3 +141,26 @@ rust_test { +@@ -186,3 +145,26 @@ rust_test { "examples/rootca.crt", ], } |