diff options
Diffstat (limited to 'patches/Android.bp.patch')
| -rw-r--r-- | patches/Android.bp.patch | 62 |
1 files changed, 44 insertions, 18 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 5a4dc0d..a4db82e 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,9 +1,11 @@ ---- Android.bp 2020-12-16 14:02:37.120186423 +0900 -+++ Android.bp.new 2020-12-15 22:43:09.717301330 +0900 -@@ -1,74 +1,58 @@ - // This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.patch. +diff --git a/Android.bp b/Android.bp +index a3f7464..d398440 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -1,74 +1,55 @@ + // This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch. --rust_library_shared { +-rust_ffi_shared { - name: "libquiche_shared", - stem: "libquiche", - host_supported: true, @@ -49,7 +51,6 @@ "default", ], - rustlibs: [ -+ + // Link all crates statically to create a self-contained .so library. + rlibs: [ "liblazy_static", @@ -60,14 +61,19 @@ ], - static_libs: [ + prefer_rlib: true, -+ + shared_libs: [ "libcrypto", "libssl", ], --} ++ // For DnsResolver (Mainline module introduced in Q). ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } --rust_library_static { +-rust_ffi_static { - name: "libquiche_static", - stem: "libquiche", - host_supported: true, @@ -88,14 +94,7 @@ - static_libs: [ - "libcrypto", - "libssl", -+ // For DnsResolver (Mainline module introduced in Q). -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", - ], -+ min_sdk_version: "29", -+} -+ +- ], +rust_ffi { + name: "libquiche_ffi", + defaults: ["libquiche_defaults"], @@ -106,4 +105,31 @@ + defaults: ["libquiche_defaults"], } - // dependent_library ["feature_list"] + rust_defaults { +@@ -79,7 +60,7 @@ rust_defaults { + auto_gen_config: true, + edition: "2018", + features: [ +- "boringssl-vendored", ++ "boringssl", + "default", + ], + rustlibs: [ +@@ -91,10 +72,16 @@ rust_defaults { + "libring", + "liburl", + ], +- static_libs: [ ++ shared_libs: [ + "libcrypto", + "libssl", + ], ++ data: [ ++ "examples/cert.crt", ++ "examples/cert.key", ++ "examples/cert-big.crt", ++ "examples/rootca.crt", ++ ] + } + + rust_test_host { |