aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-22Adding bluetooth apex am: af5e0a0c20 am: 4f7d46acc5 am: fb7992b7e9Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1931448 Change-Id: I5eae041661e4335514d0547dbf7844f59a4d6420
2021-12-22Adding bluetooth apex am: af5e0a0c20 am: 4f7d46acc5Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1931448 Change-Id: I4793c7521e38f45e942473e7a72782aa532ff571
2021-12-22Adding bluetooth apex am: af5e0a0c20Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1931448 Change-Id: I74fccdf379d12d055608a556530bed9f67be0190
2021-12-21Adding bluetooth apexandroid-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-1Roopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: I6d2f93bd2faac8c69f483640bdb29021c0897eff
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6b43ae8a17 ↵Joel Galenson
am: 2e7d7d0ddf am: b9f4d8c516 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1912436 Change-Id: I917f1b22fe75ce763aa188e428e447effce00c16
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6b43ae8a17 ↵Joel Galenson
am: 2e7d7d0ddf Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1912436 Change-Id: I2c9609f375d8b00231bb2103e21ef6a6f694fd36
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6b43ae8a17Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1912436 Change-Id: I270e2f39474aa8e92e6899c73db5702ee8dfdd50
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: I584b6bb00affe66c0a85f96575e9c738de8a3d2c
2021-10-12Merge "Upgrade rust/crates/futures-util to 0.3.17" am: 67b7ffd629 am: ↵Joel Galenson
1ebf6047b9 am: 6a68c699fb am: a37c83b499 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1833615 Change-Id: I36248191fcb3124ff3be12d53645478b400d718f
2021-10-12Merge "Upgrade rust/crates/futures-util to 0.3.17" am: 67b7ffd629 am: ↵Joel Galenson
1ebf6047b9 am: 6a68c699fb Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1833615 Change-Id: Ia0f9d4bbd9209bb24245ee177c823963a1bad13f
2021-10-12Merge "Upgrade rust/crates/futures-util to 0.3.17" am: 67b7ffd629 am: 1ebf6047b9Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1833615 Change-Id: I99a6d92c60ed47981372ef2749b0f3f28ef96647
2021-10-12Merge "Upgrade rust/crates/futures-util to 0.3.17" am: 67b7ffd629Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1833615 Change-Id: I1b436d5a37019f89ad20c75b99178e3fa837cfe2
2021-10-12Merge "Upgrade rust/crates/futures-util to 0.3.17"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
2021-09-22Upgrade rust/crates/futures-util to 0.3.17Joel Galenson
Test: make Change-Id: I8ab43c55906b0f8e81fd92f62b3814b60202de59
2021-08-24Update TEST_MAPPING am: 541ee666ea am: 50ca4591e0 am: 889158e65b am: 7cb7691904Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1805914 Change-Id: I8f8ee32c1a755d83cf6223e04d4d673787147732
2021-08-24Update TEST_MAPPING am: 541ee666ea am: 50ca4591e0 am: 889158e65bJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1805914 Change-Id: I552e206c90c7430d20b050067978a5dd776aa947
2021-08-24Update TEST_MAPPING am: 541ee666ea am: 50ca4591e0Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1805914 Change-Id: Ia1f750321eb4e5b308b42ff82ff9a7088944ca81
2021-08-24Update TEST_MAPPING am: 541ee666eaJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1805914 Change-Id: I6daabd09843674159dc14cc97325a941e7f8141d
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I32e096226346128930a64326288dbd882978744b
2021-08-18Upgrade rust/crates/futures-util to 0.3.16 am: 41d5e42e28 am: a4fd0a3571 am: ↵Joel Galenson
f51829f51e am: 77b15680e8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1791033 Change-Id: I594bcffc44e48f055a806485e073f5f91ac97f60
2021-08-18Upgrade rust/crates/futures-util to 0.3.16 am: 41d5e42e28 am: a4fd0a3571 am: ↵Joel Galenson
f51829f51e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1791033 Change-Id: I407a35283ed3805adb9afd62cc328599fa0a758e
2021-08-18Upgrade rust/crates/futures-util to 0.3.16 am: 41d5e42e28 am: a4fd0a3571Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1791033 Change-Id: I0bf17e1e5ea7549530b0298c9f424b01d65d2569
2021-08-18Upgrade rust/crates/futures-util to 0.3.16 am: 41d5e42e28Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1791033 Change-Id: Idfb647fe0909bbd9037465ad2fb1f3ff54536802
2021-08-09Upgrade rust/crates/futures-util to 0.3.16Joel Galenson
Test: make Change-Id: I2b7f571745922fbf3e3eba05c872ddadbfba5dd7
2021-06-22Merge "Make libfutures_util available to DnsResolver" am: 590d610b24 am: ↵Treehugger Robot
97518d13e2 am: 7284bcf90a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1742913 Change-Id: I9ced4d31ebc6c87092134dbe15c57b8ec37e3ad8
2021-06-22Merge "Make libfutures_util available to DnsResolver" am: 590d610b24 am: ↵Treehugger Robot
97518d13e2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1742913 Change-Id: I024e5afc0053dc72523b4820fa58dea122937364
2021-06-22Merge "Make libfutures_util available to DnsResolver" am: 590d610b24Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1742913 Change-Id: Ie5af1bb0e4d9f2cd36ae482e3ee17782cfb0d33e
2021-06-22Merge "Make libfutures_util available to DnsResolver"android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
2021-06-22Make libfutures_util available to DnsResolverLuke Huang
Test: TH Bug 155855709 Change-Id: I0ec930eed529096c03e508273f55d120208fdcc6
2021-05-25Upgrade rust/crates/futures-util to 0.3.15 am: 7a983027b4 am: e278122060 am: ↵Joel Galenson
80f718b786 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1712948 Change-Id: I3960fc1d19da7d4970bcfbf40b79321736a8d316
2021-05-25Upgrade rust/crates/futures-util to 0.3.15 am: 7a983027b4 am: e278122060Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1712948 Change-Id: I06f862ffe217dec0a757eb3d265a82cacae07f45
2021-05-25Upgrade rust/crates/futures-util to 0.3.15 am: 7a983027b4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1712948 Change-Id: I248872b37e1b2a61ee339b67da4c8206270df71e
2021-05-19Upgrade rust/crates/futures-util to 0.3.15Joel Galenson
Test: make Change-Id: Ibac5fc0ece362434ec0af181cfd9860570da7813
2021-04-28Generate apex_available from c2a instead of a patch am: 4fa481b6ab am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devJoel Galenson
c09fc84c6f am: e4add52767 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1688788 Change-Id: Idb861a2d2b33e6159c11e2200a2597d1974150d6
2021-04-28Generate apex_available from c2a instead of a patch am: 4fa481b6ab am: ↵Joel Galenson
c09fc84c6f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1688788 Change-Id: I87dc08c864700313ecc59d5ee60211aa69e05fc6
2021-04-28Generate apex_available from c2a instead of a patch am: 4fa481b6abJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1688788 Change-Id: Icf1e6e1f1ba254019f5f15e380774810ab8078c3
2021-04-27Generate apex_available from c2a instead of a patchandroid-s-beta-2android-s-beta-1Joel Galenson
Test: Run c2a Test: Build Change-Id: Id081a50c6da633b4a3290184440c02a53af108c6
2021-04-02Upgrade rust/crates/futures-util to 0.3.13 am: 1fdff8fd4c am: cf1d92ef03 am: ↵Joel Galenson
ac32bfb85d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1662922 Change-Id: I2ae408bfa218468323fecc75cab01c06ba6c8b8b
2021-04-02Upgrade rust/crates/futures-util to 0.3.13 am: 1fdff8fd4c am: cf1d92ef03Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1662922 Change-Id: Ia005277cc82b99683b6e62ac71c9cfee99653b69
2021-04-02Upgrade rust/crates/futures-util to 0.3.13 am: 1fdff8fd4cJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1662922 Change-Id: I0247d2fa66aa9ccee39d7219a0ae75468c013ee5
2021-04-01Upgrade rust/crates/futures-util to 0.3.13Joel Galenson
Test: make Change-Id: If826c7778479b9b93d36d70510ced93e411d40e1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2eb284d7db -s ↵Xin Li
ours am: 114cfcca1b -s ours am skip reason: Change-Id I9487784e642a7060afa4f72605428b1ce7638ba8 with SHA-1 306a3978ca is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I616de07624dcfc7b0aabb3d26bbdfb6fdb97d0f8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2eb284d7db -s oursXin Li
am skip reason: Change-Id I9487784e642a7060afa4f72605428b1ce7638ba8 with SHA-1 306a3978ca is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic3339b8fdf0eb3b20c6f1e2b13086e053b752f89
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I9487784e642a7060afa4f72605428b1ce7638ba8 Change-Id: I378e8ddcd1a64fd65bfdf09e2ac265ef26d4dd86
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-util am: ↵Bob Badour
90bdae9910 am: 3e62b128c5 am: da9532492d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1587828 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5d589216e2bc8545a1fe156837de2314388740f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-util am: ↵Bob Badour
90bdae9910 am: 3e62b128c5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1587828 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I79ed2f36baeef60a70f44c6c9b53f7c247b71c0d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-util am: ↵Bob Badour
90bdae9910 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1587828 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia27a92acd9c9f45095e9dc67d46fd50ddfe0c51d
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-utilandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9d650c5dc53803fb95a354acbcb79dff6ba9eef4
2021-02-10Merge "Upgrade rust/crates/futures-util to 0.3.12" am: 102eb371e7 am: ↵Treehugger Robot
ace3f190a6 am: 63c1e1810c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1581956 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11142c342032cbaf58fa0c2dbfcaf70bafe63de8
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 21:36:31 +0000