aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a76904f4b -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: e0f0c29594 -s ours am skip reason: Change-Id I7689e32ef22c2c738436a491b2215272e032343c with SHA-1 83002a5588 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I166ce48c633836945d1b6a20d48404d7142988fe
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a76904f4b -s oursXin Li
am skip reason: Change-Id I7689e32ef22c2c738436a491b2215272e032343c with SHA-1 83002a5588 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f51a3b21c36af30bf53591ffd0ad95b62766650
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I7689e32ef22c2c738436a491b2215272e032343c Change-Id: Icc515d344f3f352daa17059a0f718e2350c44e1f
2021-02-17Merge "Upgrade rust/crates/tokio-macros to 1.1.0" am: 255e5522aa am: ↵Ivan Lozano
2ee9d9c336 am: c5ee9ab703 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1582274 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4ab38d177ea5bd1746cbb937f3f22479c6abbbf6
2021-02-17Merge "Upgrade rust/crates/tokio-macros to 1.1.0" am: 255e5522aa am: 2ee9d9c336Ivan Lozano
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1582274 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8013523b284b2160e6bb761116ad70440db9dad7
2021-02-17Merge "Upgrade rust/crates/tokio-macros to 1.1.0" am: 255e5522aaIvan Lozano
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1582274 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97e31c3a8cc9d37e99294b3360d9f72b16431f32
2021-02-17Merge "Upgrade rust/crates/tokio-macros to 1.1.0"android-s-preview-1Ivan Lozano
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/tokio-macros am: ↵Bob Badour
55f1d34131 am: 71c110cc82 am: 04224cbace Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1588723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If68f20cdbaa675007a306064a0265fd9abd073b8
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/tokio-macros am: ↵Bob Badour
55f1d34131 am: 71c110cc82 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1588723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d7dae933586d208b4bdb80bd938f222a5cb34a6
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/tokio-macros am: ↵Bob Badour
55f1d34131 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1588723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I81722cafaefb77b816d8a5b9ae8f3f574fe222d0
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/tokio-macrosBob Badour
Added SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I78fcb1885d5c93895dcd957f5e909773c623789a
2021-02-11Clean up rust_test_host TEST_MAPPING after default update am: 7582db73cf am: ↵Julien Desprez
b18c76d643 am: b548e261ee Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1583383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0edc83727def1bdfbd11d0a61652226543d8a1ff
2021-02-11Clean up rust_test_host TEST_MAPPING after default update am: 7582db73cf am: ↵Julien Desprez
b18c76d643 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1583383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ad5a169445163282b6d37e90e9a33f5badce0ea
2021-02-11Clean up rust_test_host TEST_MAPPING after default update am: 7582db73cfJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1583383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac9569812abc3df84e5d3cf244c8e5d221f002df
2021-02-10Clean up rust_test_host TEST_MAPPING after default updateJulien Desprez
After b/177689340, rust_test_host doesn't need TEST_MAPPING config anymore to run in presubmit. Change-Id: Ibab7c2674cf4f4e3abc341c65edcf62a5f684cc8 Test: presubmit Bug: 178646865
2021-02-09Upgrade rust/crates/tokio-macros to 1.1.0Haibo Huang
Test: make Change-Id: I63fd8507244e6a7621358c51e9310a519f2267e8
2021-01-26Upgrade rust/crates/tokio-macros to 1.0.0 am: b71afff3c8 am: 5a5ae3047b am: ↵Haibo Huang
333a85fa58 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1535568 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I51cb056a4ae6e120b5479ec6773b25e84b754112
2021-01-26Upgrade rust/crates/tokio-macros to 1.0.0 am: b71afff3c8 am: 5a5ae3047bHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1535568 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idffb5dde06c4388e562f1071e4deb65a540f2b0c
2021-01-26Upgrade rust/crates/tokio-macros to 1.0.0 am: b71afff3c8Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1535568 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic17344a74340bb693d0b6023fac75d198fded66a
2020-12-23Upgrade rust/crates/tokio-macros to 1.0.0platform-tools-31.0.0Haibo Huang
Test: make Change-Id: I832a8ae4209641c73407b68eaae0a08effd82bd6
2020-12-23Upgrade rust/crates/tokio-macros to 0.3.2 am: b98e0debbb am: 7152cb68d5 am: ↵Haibo Huang
83002a5588 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1534332 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I904f65c7aa51d2b40e5f1c3b60540148773b4db8
2020-12-23Upgrade rust/crates/tokio-macros to 0.3.2 am: b98e0debbb am: 7152cb68d5Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1534332 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7689e32ef22c2c738436a491b2215272e032343c
2020-12-23Upgrade rust/crates/tokio-macros to 0.3.2 am: b98e0debbbHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1534332 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7009c3ae4446a90053953980eb96af4ada053779
2020-12-22Upgrade rust/crates/tokio-macros to 0.3.2Haibo Huang
Test: make Change-Id: Ib3f1d6c666a79df996e30fea255d62372a8b49a8
2020-11-05TEST_MAPPING: test dependers of this crate am: 27ef5a4935 am: 72a5f2488c am: ↵Jeff Vander Stoep
f8a0a6c22c am: 0e5b1b0e3b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1488728 Change-Id: I04267060d28ab087474db12aaea7d8f201fab754
2020-11-05TEST_MAPPING: test dependers of this crate am: 27ef5a4935 am: 72a5f2488c am: ↵Jeff Vander Stoep
f8a0a6c22c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1488728 Change-Id: I7653033f64b1b107c1c5dd0a53c365513423b8a8
2020-11-05TEST_MAPPING: test dependers of this crate am: 27ef5a4935 am: 72a5f2488cJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1488728 Change-Id: I92dfcdf397c949dfafc40c8388b1632fe9bc7541
2020-11-05TEST_MAPPING: test dependers of this crate am: 27ef5a4935Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1488728 Change-Id: I8238548fffbc069204e7d2746febb28793a23ae8
2020-11-05TEST_MAPPING: test dependers of this crateJeff Vander Stoep
Bug: 168167373 Test: TH Change-Id: If5ff896fac30776f1e7b9642c88c113dcb8cd862
2020-10-29Upgrade rust/crates/tokio-macros to 0.3.1 am: a2245f7b26 am: 22e9a98c65 am: ↵Haibo Huang
1eaaca41ea am: 9a291fceb8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1479548 Change-Id: Ic7d604243ea5892b35ca6c9e142add7eda9dc0ef
2020-10-29Upgrade rust/crates/tokio-macros to 0.3.1 am: a2245f7b26 am: 22e9a98c65 am: ↵Haibo Huang
1eaaca41ea Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1479548 Change-Id: I79653ad56644d53b941ba080baa09bd6480578ec
2020-10-29Upgrade rust/crates/tokio-macros to 0.3.1 am: a2245f7b26 am: 22e9a98c65Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1479548 Change-Id: I27608c7b60c35ac356fa167ec4d33ce2f4253513
2020-10-29Upgrade rust/crates/tokio-macros to 0.3.1 am: a2245f7b26Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1479548 Change-Id: I430523f1d6d1d721ee073cedc870b4b2d5d04406
2020-10-28Upgrade rust/crates/tokio-macros to 0.3.1Haibo Huang
Test: make Change-Id: I7f90f57ff0e8a32c94a01e53d6b73bd4f650813a
2020-10-26Update to tokio-macros-0.3.0 am: d80e56622a am: 35a44d05d0 am: efb60aee42 ↵Joel Galenson
am: c1939bb53c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472200 Change-Id: I699caafc9f243e614f4cd7a696b9bfd1164ef74a
2020-10-26Add Android.bp am: 37a4bf6fa0 am: b694c0cf70 am: 9deeea9198 am: f013093c1aJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472199 Change-Id: I38c25ed967372faea3983c03f5547acee3772ac7
2020-10-26Add metadata files am: 61331add25 am: f99daf7b65 am: f396cd0e32 am: 1a0f750786Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472198 Change-Id: I97cd2de1839bcf54543f71c7e8812b33432f8fad
2020-10-26Import tokio-macros-0.2.5 am: ea9e45442b am: 76a32ce049 am: 91d84b59d7 am: ↵Joel Galenson
064c299c71 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472197 Change-Id: Ic6c43ff7a1edf95d6dab9a4777304e20b06bd28d
2020-10-26Update to tokio-macros-0.3.0 am: d80e56622a am: 35a44d05d0 am: efb60aee42Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472200 Change-Id: I4a5597d1aebcbca31f1c1cd230870304b38d7a93
2020-10-26Add Android.bp am: 37a4bf6fa0 am: b694c0cf70 am: 9deeea9198Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472199 Change-Id: I86ca7d2888b4b95269373dae64a996b4732aa11b
2020-10-26Add metadata files am: 61331add25 am: f99daf7b65 am: f396cd0e32Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472198 Change-Id: I9dac0dbc867fe7318ed278be48ae408580741eda
2020-10-26Import tokio-macros-0.2.5 am: ea9e45442b am: 76a32ce049 am: 91d84b59d7Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472197 Change-Id: I3d15587ed80be4057bb888a5e9df77ed2bd2580f
2020-10-26Update to tokio-macros-0.3.0 am: d80e56622a am: 35a44d05d0Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472200 Change-Id: I5d55cc8758d78fc8a11a4d0015d45761c651adee
2020-10-26Add Android.bp am: 37a4bf6fa0 am: b694c0cf70Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472199 Change-Id: I0cd69efadb3b8e1ab4751e7c733878760fb1e0aa
2020-10-26Add metadata files am: 61331add25 am: f99daf7b65Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472198 Change-Id: I8dcd2febc71ad975011d754a0bc8cf6ab19aea02
2020-10-26Import tokio-macros-0.2.5 am: ea9e45442b am: 76a32ce049Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472197 Change-Id: If9fd4ad1947d4ff2d2a8e773268d062bfeaa285b
2020-10-26Update to tokio-macros-0.3.0 am: d80e56622aJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472200 Change-Id: I11f9cf6a66f3a2eadb99e0ee8e80f78c541334fa
2020-10-26Add Android.bp am: 37a4bf6fa0Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472199 Change-Id: Ib2a1bb79bdea0d02956de7174185e9fe3b0365b8
2020-10-26Add metadata files am: 61331add25Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472198 Change-Id: I734c6c0b67327ab950a76ce6363b1576a377760c
2020-10-26Import tokio-macros-0.2.5 am: ea9e45442bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1472197 Change-Id: I74593f000cb779211a490d607113a94ebcbaf9f2