diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:39 +0000 |
commit | d2ff91420bc91280398927b6bb4e27893961170e (patch) | |
tree | 3aa257fb83e9145418ea83bf0943612b3be0d533 /Android.bp | |
parent | d45d30c2ccbb46f025b07ab4bdf16eff409833a5 (diff) | |
parent | 160132a83d2ac610e947d04dbbfb2374031ebc6e (diff) | |
download | quiche-d2ff91420bc91280398927b6bb4e27893961170e.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 40cca5e187 am: b4686a7eaf am: 160132a83d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1912793
Change-Id: Iab088818a1d676956b33928ed65f401048582a25
Diffstat (limited to 'Android.bp')
-rw-r--r-- | Android.bp | 40 |
1 files changed, 13 insertions, 27 deletions
@@ -48,6 +48,7 @@ rust_defaults { stem: "libquiche", host_supported: true, crate_name: "quiche", + cargo_env_compat: true, srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -78,6 +79,11 @@ rust_ffi { "libcrypto", "libssl", ], + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } rust_library { @@ -98,17 +104,23 @@ rust_library_rlib { "libcrypto_static", "libssl", ], + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } rust_defaults { name: "quiche_test_defaults", crate_name: "quiche", + cargo_env_compat: true, srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", features: [ - "boringssl", + "boringssl-vendored", "default", ], rustlibs: [ @@ -150,29 +162,3 @@ rust_test { "libssl", ], } - -// dependent_library ["feature_list"] -// cc-1.0.69 -// cfg-if-0.1.10 -// cfg-if-1.0.0 -// cmake-0.1.45 -// idna-0.1.5 -// iovec-0.1.4 -// lazy_static-1.4.0 -// libc-0.2.98 "default,std" -// libm-0.2.1 "default" -// log-0.4.14 "std" -// matches-0.1.8 -// mio-0.6.23 "default,with-deprecated" -// net2-0.2.37 "default,duration" -// once_cell-1.8.0 "alloc,race,std" -// percent-encoding-1.0.1 -// ring-0.16.20 "alloc,default,dev_urandom_fallback,once_cell" -// slab-0.4.3 "default,std" -// spin-0.5.2 -// tinyvec-1.2.0 "alloc,default,tinyvec_macros" -// tinyvec_macros-0.1.0 -// unicode-bidi-0.3.5 "default" -// unicode-normalization-0.1.19 "default,std" -// untrusted-0.7.1 -// url-1.7.2 |