aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2021-02-10Merge "Upgrade rust/crates/futures-util to 0.3.12" am: 102eb371e7 am: ace3f190a6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1581956 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8484033caf568f8922b62d966c43e6cd3af9dd5
2021-02-10Merge "Upgrade rust/crates/futures-util to 0.3.12" am: 102eb371e7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1581956 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1094a39a3e2a6f3229cbacef8c0510c400b1050d
2021-02-10Merge "Upgrade rust/crates/futures-util to 0.3.12"Treehugger Robot
2021-02-10Clean up rust_test_host TEST_MAPPING after default update am: d4bc4a1f1e am: ↵Julien Desprez
b79273b585 am: 4c677a04f2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1582281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46fd95d4eaf661708a3df7c38df6225d1fab4934
2021-02-10Clean up rust_test_host TEST_MAPPING after default update am: d4bc4a1f1e am: ↵Julien Desprez
b79273b585 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1582281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I45901227ca0aeea17ee3a882688726582a0f85c2
2021-02-10Clean up rust_test_host TEST_MAPPING after default update am: d4bc4a1f1eJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1582281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I89f8eca777ccdea8a52daed159471c0eaa6ede44
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: I0cb8366f29372855a61809e754d30a9eea433839 Test: presubmit Bug: 178646865
2021-02-09Upgrade rust/crates/futures-util to 0.3.12Haibo Huang
Test: make Change-Id: I735974ef5485b6b8c6a9a5cba71199f268878982
2020-12-15add crosvm to com.android.virt am: eb238164a0 am: f821271dca am: 306a3978caJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1526463 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I05659b488ed27c388df21332412248e5c8c2fb4e
2020-12-15add crosvm to com.android.virt am: eb238164a0 am: f821271dcaJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1526463 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9487784e642a7060afa4f72605428b1ce7638ba8
2020-12-15add crosvm to com.android.virt am: eb238164a0Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1526463 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I914f0cace3ca7b52ea2f697578f610423ed50afa
2020-12-14add crosvm to com.android.virtJiyong Park
To do so, crosvm and its dependencies have the apex_available property set to "//apex_available:platform", "com.android.virt" to explicitly acknowledge the joining. Bug: 174639241 Test: m com.android.virt Change-Id: I755fda9494f4604f9190fd682fb441d07b5e645c
2020-11-24Mark ab/6881855 as merged am: 25a4bb335e am: b15179578dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/13112795 Change-Id: I6f32eeb9386010e5db2e0375698b451bbe517e79
2020-11-24Mark ab/6881855 as merged am: 25a4bb335eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/13112795 Change-Id: I3c9cbcfec7ba91792d80f059400a98f20bae6a4e
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I836982f948d75d6c96947ea342bb19c7a54cbdd0
2020-11-05TEST_MAPPING: test dependers of this crate am: cc3f15b115 am: 13d2b5fabf am: ↵Jeff Vander Stoep
99cb0f63f3 am: 36d673d799 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1488722 Change-Id: Iff2cd890686c5ace92f0ec499c1119894e0eb3eb
2020-11-05TEST_MAPPING: test dependers of this crate am: cc3f15b115 am: 13d2b5fabf am: ↵Jeff Vander Stoep
99cb0f63f3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1488722 Change-Id: If2f714fe74d118887d7eb7e47a47a2addc60d4c9
2020-11-05TEST_MAPPING: test dependers of this crate am: cc3f15b115 am: 13d2b5fabfJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1488722 Change-Id: I87b7d6c947a86e21531db7a0b6a92b94e9663f6b
2020-11-05TEST_MAPPING: test dependers of this crate am: cc3f15b115Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1488722 Change-Id: Id449e193db7e46991a437d0843769a2c9e805be3
2020-11-05TEST_MAPPING: test dependers of this crateJeff Vander Stoep
Bug: 168167373 Test: TH Change-Id: Id408885ee45c2c238933041ac98a4ac23d243a88
2020-10-26Upgrade rust/crates/futures-util to 0.3.7 am: d45e96efa4 am: d1a65118f7 am: ↵Chih-Hung Hsieh
57f89a4e27 am: 9819caea10 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1473737 Change-Id: Id20ab0175a95897ff31c89bcc063fe87cc522f7e
2020-10-26Upgrade rust/crates/futures-util to 0.3.7 am: d45e96efa4 am: d1a65118f7 am: ↵Chih-Hung Hsieh
57f89a4e27 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1473737 Change-Id: I6026d0f107dc528ace0c157828a24e1c9b5bcfce
2020-10-26Upgrade rust/crates/futures-util to 0.3.7 am: d45e96efa4 am: d1a65118f7Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1473737 Change-Id: I4a91d03768ae1224a8e5c21320b06f23e603f939
2020-10-26Upgrade rust/crates/futures-util to 0.3.7 am: d45e96efa4Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1473737 Change-Id: I29107194652850b6ca43f8496e03f0f817a67ab1
2020-10-25Upgrade rust/crates/futures-util to 0.3.7Chih-Hung Hsieh
Test: make all rust crates Change-Id: I9af426348ba630949d7f3facc0717f439cfe5a7e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 10466ab574 -s ours am: ↵Xin Li
21edd750a3 -s ours am: c18cd5e2cb -s ours am skip reason: Change-Id Ida28402cc218c1ac6de7adfc5403a99bd40f0857 with SHA-1 73820cf734 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/12793673 Change-Id: I67d7f2e3fbaf860535b53611f240446e85085c56
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 10466ab574 -s ours am: ↵Xin Li
21edd750a3 -s ours am skip reason: Change-Id Ida28402cc218c1ac6de7adfc5403a99bd40f0857 with SHA-1 73820cf734 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/12793673 Change-Id: If78e59de78319c758f09ab4f2a9cf09a317e352b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 10466ab574 -s oursXin Li
am skip reason: Change-Id Ida28402cc218c1ac6de7adfc5403a99bd40f0857 with SHA-1 73820cf734 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/12793673 Change-Id: I8d9b4b4412ce287e39f04a2b631e8bd0cd70ac86
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ida28402cc218c1ac6de7adfc5403a99bd40f0857 Change-Id: Icfadb9e7846bf8bf964e3ec2b9e827209844a485
2020-08-28Fix futures-util/METADATA am: e2d5224e89 am: 3c30879817 am: 029b1c3642 am: ↵Chih-Hung Hsieh
fed3dc5e32 am: 38c8b8b2a1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1414037 Change-Id: I95a4d9348003e99ac69cd306fd448f3431b7af13
2020-08-27Fix futures-util/METADATA am: e2d5224e89 am: 3c30879817 am: 029b1c3642 am: ↵Chih-Hung Hsieh
fed3dc5e32 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1414037 Change-Id: Ib4d6246bb9ce912b291f0c009e3728f5de83e953
2020-08-27Fix futures-util/METADATA am: e2d5224e89 am: 3c30879817 am: 029b1c3642Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1414037 Change-Id: I9e72d286b2a746413ed38638ee239671869eb774
2020-08-27Fix futures-util/METADATA am: e2d5224e89 am: 3c30879817Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1414037 Change-Id: I5e7ca3151eaf6dad7a3ca50288eafad7e0156acc
2020-08-27Fix futures-util/METADATA am: e2d5224e89Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1414037 Change-Id: I4f5af541aad47775bb17b9a2198f373889d9400a