diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:11 +0000 |
commit | 39ed6def9c4f3ebae971283806dd85ddf66bc93f (patch) | |
tree | 3aa257fb83e9145418ea83bf0943612b3be0d533 | |
parent | d016139ffb7557352a63ce6f5a05040dbe92473d (diff) | |
parent | d2ff91420bc91280398927b6bb4e27893961170e (diff) | |
download | quiche-android13-mainline-go-adbd-release.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 40cca5e187 am: b4686a7eaf am: 160132a83d am: d2ff91420bt_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1912793
Change-Id: Ic3be1806b7503ef4902979502f803c2c360d9a71
-rw-r--r-- | Android.bp | 40 | ||||
-rw-r--r-- | TEST_MAPPING | 8 | ||||
-rw-r--r-- | cargo2android.json | 35 | ||||
-rw-r--r-- | patches/Android.bp.patch | 61 |
4 files changed, 79 insertions, 65 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 diff --git a/TEST_MAPPING b/TEST_MAPPING index ba9a257..1d3032b 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -7,5 +7,13 @@ { "name": "quiche_device_test_src_lib" } + ], + "presubmit-rust": [ + { + "name": "doh_unit_test" + }, + { + "name": "quiche_device_test_src_lib" + } ] } diff --git a/cargo2android.json b/cargo2android.json index 94f80e4..1317ea7 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,18 +1,19 @@ { - "apex-available": [ - "//apex_available:platform", - "com.android.resolv" - ], - "min_sdk_version": "29", - "dependencies": true, - "test-data": [ - "src/lib.rs=examples/cert.crt", - "src/lib.rs=examples/cert.key", - "src/lib.rs=examples/cert-big.crt", - "src/lib.rs=examples/rootca.crt" - ], - "tests": true, - "device": true, - "run": true, - "patch": "patches/Android.bp.patch" -}
\ No newline at end of file + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "no-pkg-vers": true, + "patch": "patches/Android.bp.patch", + "run": true, + "test-data": [ + "src/lib.rs=examples/cert.crt", + "src/lib.rs=examples/cert.key", + "src/lib.rs=examples/cert-big.crt", + "src/lib.rs=examples/rootca.crt" + ], + "tests": true +} diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index f6a32f4..48c6dee 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,7 +2,7 @@ diff --git a/Android.bp b/Android.bp index aced8a6..578cc68 100644 --- a/Android.bp +++ b/Android.bp -@@ -43,25 +43,38 @@ cc_library_headers { +@@ -43,26 +43,39 @@ cc_library_headers { min_sdk_version: "29", } @@ -13,6 +13,7 @@ index aced8a6..578cc68 100644 stem: "libquiche", host_supported: true, crate_name: "quiche", + cargo_env_compat: true, srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -46,12 +47,13 @@ index aced8a6..578cc68 100644 "libcrypto", "libssl", ], -@@ -69,52 +82,20 @@ rust_ffi_shared { +@@ -69,54 +82,20 @@ rust_ffi_shared { rust_library { name: "libquiche", - host_supported: true, - crate_name: "quiche", +- cargo_env_compat: true, - srcs: ["src/lib.rs"], - edition: "2018", - features: [ @@ -86,6 +88,7 @@ index aced8a6..578cc68 100644 - stem: "libquiche", - host_supported: true, - crate_name: "quiche", +- cargo_env_compat: true, - srcs: ["src/lib.rs"], - edition: "2018", - features: [ @@ -105,17 +108,28 @@ index aced8a6..578cc68 100644 + "libcrypto_static", "libssl", ], + apex_available: [ +@@ -111,17 +90,13 @@ rust_library_rlib { + min_sdk_version: "29", } -@@ -127,7 +108,7 @@ rust_defaults { + +-rust_test { +- name: "quiche_test_src_lib", +- host_supported: true, ++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, +- test_options: { +- unit_test: true, +- }, edition: "2018", features: [ -- "boringssl-vendored", -+ "boringssl", - "default", - ], - rustlibs: [ -@@ -139,10 +120,6 @@ rust_defaults { + "boringssl", +@@ -136,10 +132,6 @@ rust_test { "libring", "liburl", ], @@ -126,25 +140,30 @@ index aced8a6..578cc68 100644 data: [ "examples/cert.crt", "examples/cert.key", -@@ -151,11 +134,21 @@ rust_test_host { - test_options: { - unit_test: true, - }, +@@ -149,3 +118,26 @@ rust_test { + "examples/rootca.crt", + ], + } ++ ++rust_test_host { ++ name: "quiche_host_test_src_lib", ++ defaults: ["quiche_test_defaults"], ++ test_options: { ++ unit_test: true, ++ }, + shared_libs: [ + "libcrypto", + "libssl", + ], - } - - rust_test { - name: "quiche_device_test_src_lib", - defaults: ["quiche_test_defaults"], ++} ++ ++rust_test { ++ name: "quiche_device_test_src_lib", ++ defaults: ["quiche_test_defaults"], + // To run this test in R platform, it's required to statically link + // libcrypto and libssl. + static_libs: [ + "libcrypto_static", + "libssl", + ], - } - - // dependent_library ["feature_list"] ++} |