aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-11[automerger skipped] Empty merge of ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-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_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_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_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_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-uwb-releaseandroid13-mainline-tzdata4-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-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: de76e577a6 -s ours am: 7fb86a6bec -s ours am skip reason: Merged-In I9907e14d99d89027a81fe1114431c3a2d86a437c with SHA-1 d92fb672bf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/16843714 Change-Id: If58995941b2a9452a7900f449ff991e3d8054848
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: de76e577a6 -s ours am skip reason: Merged-In I9907e14d99d89027a81fe1114431c3a2d86a437c with SHA-1 d92fb672bf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/16843714 Change-Id: Iaf8e4aebbed7266fc124cc038a450c25f46c8877
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I9907e14d99d89027a81fe1114431c3a2d86a437c Change-Id: I46864816ae35980b40a203670139c9e39bfc7894
2022-01-27Make vendor available am: be29509dc8 am: 8e94038375 am: 71c80d96eb am: ↵Matthew Maurer
2f7618abb4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1960335 Change-Id: I78bf3262b5394d555a9a26be3e188f70284a4fdc
2022-01-27Make vendor available am: be29509dc8 am: 8e94038375 am: 71c80d96ebMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1960335 Change-Id: Ia152414255293a3275d5f4b8269db24c877e74da
2022-01-27Make vendor available am: be29509dc8 am: 8e94038375Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1960335 Change-Id: Ia9ead4f9cc95c2adfc230f2d28a9c55a56279fa4
2022-01-27Make vendor available am: be29509dc8Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1960335 Change-Id: I7606cdf86a1431711a8f039000fad283a7da8521
2022-01-25Make vendor availableandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Matthew Maurer
Bug: 216358770 Change-Id: Ie4c198033aee9b92632d04c28b407504a45392bc
2021-12-22Adding bluetooth apex am: d92fb672bf am: 1cc71d56f2 am: 2680cc3bd9 am: ↵Roopa Sattiraju
5c8acf5737 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1931479 Change-Id: Id920197f1c2be58264911bc1cd97d27287c90c60
2021-12-22Adding bluetooth apex am: d92fb672bf am: 1cc71d56f2 am: 2680cc3bd9Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1931479 Change-Id: Ie4bf38e54f6e18e6f9c4d705aea511a295eb45b8
2021-12-22Adding bluetooth apex am: d92fb672bf am: 1cc71d56f2Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1931479 Change-Id: I60c06180b8d9b0c78131ed9d03c99ff4915bd239
2021-12-22Adding bluetooth apex am: d92fb672bfRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1931479 Change-Id: I3e88cf5dfc7fcb603c79fdad2806db43015cb41f
2021-12-21Adding bluetooth apexRoopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: I9907e14d99d89027a81fe1114431c3a2d86a437c
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1ae1fbcb1 ↵Joel Galenson
am: 27af762298 am: 09c1194ff8 am: 36ffa24c74 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1912691 Change-Id: I27429e7a59ac1582dee06f576a765c0a44f17e22
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1ae1fbcb1 ↵Joel Galenson
am: 27af762298 am: 09c1194ff8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1912691 Change-Id: I230110650d8cbbdc4cecd3262d0e9be496f7f36d
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1ae1fbcb1 ↵Joel Galenson
am: 27af762298 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1912691 Change-Id: Iecca7f2933bd660503c1293865c7e61f05df3a93
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1ae1fbcb1Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1912691 Change-Id: Iccd54fb02e88a016d50e2359b7152c686e5e1c88
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Manually modified handwritten test bp file. Test: None Change-Id: Ida43651bd375fec8c379397cf4f344ef5e2912af
2021-11-22Add apex_available. am: a9123a9ae9 am: 00f8918c59 am: 86e21fc524 am: 966e63a482Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1897833 Change-Id: I2e08d30cf68519c40b8cc384c1ec02ab9ebaf777
2021-11-22Add apex_available. am: a9123a9ae9 am: 00f8918c59 am: 86e21fc524Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1897833 Change-Id: I5446dfd44e39286c5f95c1b2f88289240c131508
2021-11-22Add apex_available. am: a9123a9ae9 am: 00f8918c59Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1897833 Change-Id: Ia5b4f56a6a457fe5acbb627b3af064c46c920cd6
2021-11-22Add apex_available. am: a9123a9ae9Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1897833 Change-Id: I5e9d5cceba7d0dec8aaacd4165b7e57711191993
2021-11-19Add apex_available.Joel Galenson
Test: TreeHugger Change-Id: If837a7c7b1dbadab67b83b280f21f7c70dcf5bf2
2021-11-18[automerger skipped] DO NOT MERGE Remove cargo compat and nix tests am: ↵Matthew Maurer
b8563af5d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/16277163 Change-Id: I490072d67278f11f99bc11f5314ddf2b03268717
2021-11-18Merge up to 1.14.0 to get security fixes am: d0f23c3747Matthew Maurer
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/16276749 Change-Id: I7fa48c4357c7dda27bf4bcf5d49926de9c4c31a2
2021-11-17DO NOT MERGE Remove cargo compat and nix testsMatthew Maurer
The modern updater tool adds two new fields to cargo imported packages. Tokio does not strictly need either, and the build system for mainline doesn't know about them yet, so they need to be removed to take the update. The tests in the new version of tokio are run on AOSP, but require an updated version of the nix crate. To avoid a backport chain, I've simply disabled those tests here. Test: m Bug: 206680413 Change-Id: I3fcc129036c9f1e8d166e838f1915d4c046b98fe
2021-11-16Merge up to 1.14.0 to get security fixesMatthew Maurer
Test: m Bug: 206680413 Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD Change-Id: I13cf66eadcf068b7cf9cd433907edc4d1639fe3d
2021-11-16Update to 1.14.0 am: 1db412d2c3 am: 786869e7d4 am: 5b1b46ec52 am: e96ca1b2f8Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1892699 Change-Id: I2b305ef5c29980746120b676a4dfbb9f1afa82fb
2021-11-16Update to 1.14.0 am: 1db412d2c3 am: 786869e7d4 am: 5b1b46ec52Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1892699 Change-Id: Id0f0b3f8de0f5734f7e7c94d14d2e5672a3ba5fd
2021-11-16Update to 1.14.0 am: 1db412d2c3 am: 786869e7d4Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1892699 Change-Id: Ic71ca40bfd185d21110f7ff7ee5de5a62e698a68
2021-11-16Update to 1.14.0 am: 1db412d2c3Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1892699 Change-Id: I4768fffbee04a117ff672f0b3227b0b97242d43a
2021-11-16Update to 1.14.0Jeff Vander Stoep
Test: atest Change-Id: I713529f5ba957c212f50bde27b4428612dbcdefd
2021-10-08Merge "Upgrade rust/crates/tokio to 1.12.0" am: e16ac718df am: 7c69dbe097 ↵Joel Galenson
am: d407740429 am: b4b1fce325 am: c6ad7e38da Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1833327 Change-Id: I328256e17e3550a56757bd8aca0cc3fbb07a114c
2021-10-08Merge "Upgrade rust/crates/tokio to 1.12.0" am: e16ac718df am: 7c69dbe097 ↵Joel Galenson
am: d407740429 am: b4b1fce325 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1833327 Change-Id: I954c791e9c7e888660ff64e48d280bae21c38360
2021-10-08Merge "Upgrade rust/crates/tokio to 1.12.0" am: e16ac718df am: 7c69dbe097 ↵Joel Galenson
am: d407740429 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1833327 Change-Id: I0dfd52221c8aae64fb0a18ebe2eee6d1b090d4d6
2021-10-08Merge "Upgrade rust/crates/tokio to 1.12.0" am: e16ac718df am: 7c69dbe097Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1833327 Change-Id: I75e8e8b239472bf227fc1464b7d99b917791ffa7
2021-10-08Merge "Upgrade rust/crates/tokio to 1.12.0" am: e16ac718dfJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1833327 Change-Id: If3efbcadf0ba1879fc7b299ef291c17dd49fcf61
2021-10-08Merge "Upgrade rust/crates/tokio to 1.12.0"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
2021-09-30Upgrade rust/crates/tokio to 1.12.0Joel Galenson
Test: make Change-Id: I4b0bd405c0b615f886e5a6606e0bf7c0ac7c6699
2021-08-25Upgrade tokio to 1.10.1 am: d61267ffdf am: 5995a2b9e7 am: b4663de2ac am: ↵Thiébaud Weksteen
e2bd347716 am: b7e7ce24af Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1806593 Change-Id: I3783fb2fd675cf3ebd293175e649f45f7ad171e2
2021-08-25Upgrade tokio to 1.10.1 am: d61267ffdf am: 5995a2b9e7 am: b4663de2ac am: ↵Thiébaud Weksteen
e2bd347716 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1806593 Change-Id: I4a9fcdabe0acf9074f765bf9a2082d2186bd8caf
2021-08-25Upgrade tokio to 1.10.1 am: d61267ffdf am: 5995a2b9e7 am: b4663de2acThiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1806593 Change-Id: I71776e2eafdbd8a3747baf8c4a952b2ab07a7315
2021-08-25Upgrade tokio to 1.10.1 am: d61267ffdf am: 5995a2b9e7Thiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1806593 Change-Id: Ie94fca2c45f537842c25b3beee96a1a7f7a0989e
2021-08-25Upgrade tokio to 1.10.1 am: d61267ffdfThiébaud Weksteen
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1806593 Change-Id: Ic86e8a97539dc62606b917f7909213f848bbe038
2021-08-25Upgrade tokio to 1.10.1android-s-beta-5android-s-beta-5Thiébaud Weksteen
Test: m Change-Id: I4ace63dd59e80f258b2aefdc2f34a67fc6ed1bfb
2021-08-18Upgrade rust/crates/tokio to 1.10.0 am: 642961436a am: c2aa9843d3 am: ↵Joel Galenson
587ee14987 am: 6d452d80d7 am: 52c5d8761c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1791041 Change-Id: Ibf33e99e209744de5731b25acbdc363c48408950
2021-08-17Upgrade rust/crates/tokio to 1.10.0 am: 642961436a am: c2aa9843d3 am: ↵Joel Galenson
587ee14987 am: 6d452d80d7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1791041 Change-Id: I248033b6e7556d07cdcf0680fe3bd76b65fc6962
2021-08-17Upgrade rust/crates/tokio to 1.10.0 am: 642961436a am: c2aa9843d3 am: 587ee14987Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1791041 Change-Id: I3fff496025b4e7a68879027dd87e8e1ad73d73e7
2021-08-17Upgrade rust/crates/tokio to 1.10.0 am: 642961436a am: c2aa9843d3Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1791041 Change-Id: I51f60419aaa472f8901d8bfe70204e87a719bc9e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:45:24 +0000