aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-09Make tokio-macros available to product and vendor am: 404b98a512 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseMatthew Maurer
67b198019a am: ebc3fa84c0 am: 39ff3ac1e5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2475392 Change-Id: I73a0a0c5086ae061baf9093fa6be5c8e4c0b8cd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make tokio-macros available to product and vendor am: 404b98a512 am: ↵android14-devMatthew Maurer
67b198019a am: ebc3fa84c0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2475392 Change-Id: I7162a3fdb8c213194172deca0660294e0b97058a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make tokio-macros available to product and vendor am: 404b98a512 am: 67b198019aMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2475392 Change-Id: Ie0ead7c04916e7f2e3e393801afe3db703e5b1b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make tokio-macros available to product and vendor am: 404b98a512android-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2475392 Change-Id: I3a9b891b0dfe3248d0783f0682c9b1644775f05c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make tokio-macros available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: I00212a8dadff39c49e8e3d6dc5a0b6ea7c46f953
2023-01-31Update TEST_MAPPING am: 9acfca80e0 am: 362d29ce4f am: cf82df00a4Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2411810 Change-Id: I9d0491b9c555f56702252af41163a252aca7361b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 9acfca80e0 am: 362d29ce4fJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2411810 Change-Id: If4eb9a9665c3fe571e2d12b12d423284eb90eb72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 9acfca80e0Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2411810 Change-Id: Ib37a11a9f0a3add7a28abcf3ed120dc06a03eba3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30Update TEST_MAPPINGJeff Vander Stoep
Test: atest Change-Id: Idf3e71a144eb96e0b92bf9f8c5b2e3a9ee6f4999
2023-01-18Merge "Upgrade tokio-macros to 1.8.2" am: 62dc25459d am: e839b991a6 am: ↵Chris Wailes
f0e8962912 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2346841 Change-Id: Iee6745e46a959ddb3379cfd3db2fb9a615f95284 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "Upgrade tokio-macros to 1.8.2" am: 62dc25459d am: e839b991a6Chris Wailes
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2346841 Change-Id: Ia8c3b96e1dbc920533aa4ab4f98f93d087824a82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "Upgrade tokio-macros to 1.8.2" am: 62dc25459dChris Wailes
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2346841 Change-Id: I0510ac4df639dc9f27d9c847b41711522b9ada57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18Merge "Upgrade tokio-macros to 1.8.2"main-16k-with-phonesChris Wailes
2022-12-14Upgrade tokio-macros to 1.8.2Chris Wailes
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update rust/crates/tokio-macros For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Bug: 262591027 Change-Id: I97749cc2647467a8d85b51a699a406916d1ece99
2022-06-16Merge "Update TEST_MAPPING" am: e3ed12eebe am: 9c80acd241 am: d807f8847b am: ↵Treehugger Robot
97533b17b1 am: 95e5e47c2a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2125816 Change-Id: I98c19d185ad49060387e7998f0e1e1e522859e35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: e3ed12eebe am: 9c80acd241 am: d807f8847b am: ↵Treehugger Robot
97533b17b1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2125816 Change-Id: Iee7ea1bdf1b4c4c7f31e0077ac78f5ba603360a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: e3ed12eebe am: 9c80acd241 am: d807f8847bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2125816 Change-Id: Ifc3b4a2248fa4c010fa8d05a2b5c6bd26ce3cbaa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: e3ed12eebe am: 9c80acd241main-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2125816 Change-Id: Ie1318741280527e5af8e7a5be1c05f27da906296 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING" am: e3ed12eebeTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2125816 Change-Id: I6b5bd371467366c95e75b75cfefaa1b0a6ab6c35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Merge "Update TEST_MAPPING"Treehugger Robot
2022-06-14Update TEST_MAPPINGMatthew Maurer
Test: None Bug: 236006683 Change-Id: I1fd386466afbad09d9f73cc63c7059eb8fa3b528
2022-05-31Update TEST_MAPPING am: 824745a523 am: 0777a3ed66 am: a3e3b7e581 am: ↵Matthew Maurer
6031d72312 am: a29595e673 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2108614 Change-Id: I479482063de03c660c46881b2a954c40a28ce63b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 824745a523 am: 0777a3ed66 am: a3e3b7e581 am: 6031d72312Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2108614 Change-Id: Ie8e1a3abf6113389c41b3a3ae78b0866c7323a73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 824745a523 am: 0777a3ed66 am: a3e3b7e581Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2108614 Change-Id: I11fdde27e5c5a2a5dba983c4f194b268a53b7048 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 824745a523 am: 0777a3ed66Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2108614 Change-Id: I7921ce8b13efb2d74d54069949a62496a2379efd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Update TEST_MAPPING am: 824745a523Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2108614 Change-Id: Ib1f79cfe1e762f371ced9d8f7adcf53f9fe5a53c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26Update TEST_MAPPINGMatthew Maurer
Test: None Bug: 233924440 Change-Id: I1e732ebd0a74e5ddbd1c410b0ac94986b23bed1d
2022-03-05Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4d am: c42907f442 ↵David LeGare
am: 8ee724d26a am: 5b564901fa Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: Ia423458feb708b0fa83387a0a7f59d7112cecce2
2022-03-05Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4d am: c42907f442 ↵David LeGare
am: 8ee724d26a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: I951dd57fbc2708aa8226745621f96feb8c464668
2022-03-05Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4d am: c42907f442 ↵aml_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_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010David LeGare
am: 8ee724d26a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: I8296d64e0945d51cd4d7c1a2520ded6fcaf620d9
2022-03-04Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4d am: c42907f442t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: Ia232104f938a05abeaa1b34f39aafc92ecacc8d0
2022-03-04Update tokio-macros to 1.7.0 am: 2201091026 am: 56d771eb4dDavid LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: Id1fa0b0afdbc4b493293de896282ca7b9d9db693
2022-03-04Update tokio-macros to 1.7.0 am: 2201091026David LeGare
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/2004875 Change-Id: I9ad245dbd6fb6ce66bf84679e93859211e18587a
2022-03-02Update tokio-macros to 1.7.0David LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: Ie7b2111110b0ac8353eb380144c64e578d42d4e7
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 ↵Joel Galenson
am: deafa1d498 am: a6afd5ba40 am: ed03940b7c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I71628b50a8ee70e673694d372cb5b0ad62ecbfe4
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 ↵Joel Galenson
am: deafa1d498 am: a6afd5ba40 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I49f9eba0867acb7d511fddb60cca31b0e3d51975
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 ↵Joel Galenson
am: deafa1d498 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I8db289168e7702af1759d8785a38b1d8c18926df
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417 Change-Id: I4e502f8a9b8f1cdcbad0306a82e0c42d50cfb3a8
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-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-1Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I377d1b4750f17e551a188fafa296a0c0f47067b0
2021-11-18[automerger skipped] DO NOT MERGE Remove newer cargo compat features am: ↵Matthew Maurer
64b8d17e47 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/16277378 Change-Id: I249107f64ee362020bc77ace1f0739d7816d9e7b
2021-11-18Merge up to 1.6.0 to get security fixes am: aae03f3ca7Matthew Maurer
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/16276797 Change-Id: I4b4ccc1722beb7c5786374fb8097f28dd829eb5d
2021-11-16DO NOT MERGE Remove newer cargo compat featuresMatthew 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. Test: m Bug: 206680413 Change-Id: I8566974df0008553b66e700cc194ea9b291adfe7
2021-11-16Merge up to 1.6.0 to get security fixesMatthew Maurer
Test: m Bug: 206680413 Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD Change-Id: I1943bcbf52a5c3fb20b283849d242e7f41d5d35b
2021-11-16Update to 1.6.0 am: 8fd151bbe2 am: 27a6d60a59 am: 7b7b971325 am: dd93953c41Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I995a6a57534ecddd301677d6c9ff7e6ab463fb59
2021-11-16Update to 1.6.0 am: 8fd151bbe2 am: 27a6d60a59 am: 7b7b971325Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I8781db3464cefd86a9bcf75c52b8c9d15334f29a
2021-11-16Update to 1.6.0 am: 8fd151bbe2 am: 27a6d60a59Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I32d6acef57a11eeb668e4713f5a6ebf38161f6a9
2021-11-16Update to 1.6.0 am: 8fd151bbe2Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1892676 Change-Id: I2c31cb309c5d896094417bbbbb151eba156d7377
2021-11-16Update to 1.6.0Jeff Vander Stoep
Test: atest Change-Id: Iffed8e417e0f53d281f6bc294d434c341e0af9fa
2021-10-08Merge "Upgrade rust/crates/tokio-macros to 1.4.1" am: b0c1c33f39 am: ↵Joel Galenson
1bd67db7da am: cb53010bcd am: 365a5f325e am: 974814cd08 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1842075 Change-Id: I514ea573614dde334fdbc45b853b0ccc3eb8c2c9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 03:35:56 +0000