aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-28Generate apex_available from c2a instead of a patch am: a8fea1d912 am: ↵android-mainline-12.0.0_r33android-mainline-12.0.0_r3android-mainline-12.0.0_r26android-mainline-12.0.0_r21android-mainline-12.0.0_r2android-mainline-12.0.0_r1aml_doc_310851020android12-mainline-documentsui-releaseJoel Galenson
9b2d6414ab am: 84aa6e7a64 am: de595d83f7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1688765 Change-Id: I15652fd3682e5bcbc4f640b78d4f880e06aef0de
2021-04-28Generate apex_available from c2a instead of a patch am: a8fea1d912 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
9b2d6414ab am: 84aa6e7a64 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1688765 Change-Id: Id2c337116df5e3861dff0e50756125bd4bbaafb1
2021-04-28Generate apex_available from c2a instead of a patch am: a8fea1d912 am: ↵Joel Galenson
9b2d6414ab Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1688765 Change-Id: Ibe66f5bbeb82e2ec32c5c000d0735379ab12aa89
2021-04-28Generate apex_available from c2a instead of a patch am: a8fea1d912Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1688765 Change-Id: If51178329628016c1ce17dedf5a6d739feea8710
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: I0563e32960c71f3ebe42b3151d344b0592b150d9
2021-04-02Upgrade rust/crates/futures-channel to 0.3.13 am: 7980c2c7f6 am: 55a47278c9 ↵Joel Galenson
am: c3055f4268 am: c60c4423cf Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1662920 Change-Id: I5ba7919c4531720bca1e02b4f01b29c5e1c06594
2021-04-02Upgrade rust/crates/futures-channel to 0.3.13 am: 7980c2c7f6 am: 55a47278c9 ↵Joel Galenson
am: c3055f4268 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1662920 Change-Id: I79dac153ca76e3c5d5dabe79f80eade45669a4b0
2021-04-02Upgrade rust/crates/futures-channel to 0.3.13 am: 7980c2c7f6 am: 55a47278c9Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1662920 Change-Id: Ifb74f6395aece8c6355e9e915cb2b3542e9e3d25
2021-04-02Upgrade rust/crates/futures-channel to 0.3.13 am: 7980c2c7f6Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1662920 Change-Id: If45624fa0448d01af223f287b905fc71d058eebd
2021-04-01Upgrade rust/crates/futures-channel to 0.3.13Joel Galenson
Test: make Change-Id: I8bd03bbf349f15794918288e1bbfbd41c43215f5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 19c248e34a -s ↵Xin Li
ours am: 8083b78bf1 -s ours am: 1069819d5f -s ours am skip reason: Change-Id Id3916214c2fc3c2414b2953fb1b2b89c520d5c41 with SHA-1 4113866dcc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c2e43c5103232fb22bdc22e27f0312b505de26d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 19c248e34a -s ↵Xin Li
ours am: 8083b78bf1 -s ours am skip reason: Change-Id Id3916214c2fc3c2414b2953fb1b2b89c520d5c41 with SHA-1 4113866dcc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5901df0893e5868d796acf442e9bddb85b18a61f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 19c248e34a -s oursXin Li
am skip reason: Change-Id Id3916214c2fc3c2414b2953fb1b2b89c520d5c41 with SHA-1 4113866dcc is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1f43620d8468648db46b5c0bae2fc72a7a8c295a
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Id3916214c2fc3c2414b2953fb1b2b89c520d5c41 Change-Id: I85ca98b1793141d11a980a55e90b282a327a3e57
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-channel am: ↵Bob Badour
c5627a18c1 am: 7a24b5aaaa am: b7a322a9d8 am: 629552b050 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1587829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29d0c2336b87097ae1e6e1b1c35e80998799255a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-channel am: ↵Bob Badour
c5627a18c1 am: 7a24b5aaaa am: b7a322a9d8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1587829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I294877670af662397e59a7e4cf279060a4e7f926
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-channel am: ↵Bob Badour
c5627a18c1 am: 7a24b5aaaa Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1587829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c16a25c4e675711ec8be885b13599cd33e6070a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-channel am: ↵Bob Badour
c5627a18c1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1587829 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I78cf6392cc4900ba8c80395c429ba70a76c5db88
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures-channelandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1d0b9c8b711fc6a5d45e187391fcf09e3ffbd87e
2021-02-10Upgrade rust/crates/futures-channel to 0.3.12 am: 09da603878 am: 2ea9ccb096 ↵Haibo Huang
am: ad1e3767d4 am: 79d1287e04 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1582065 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a360fe2cb37684c99ef134dfd483627ea01a661
2021-02-10Upgrade rust/crates/futures-channel to 0.3.12 am: 09da603878 am: 2ea9ccb096 ↵Haibo Huang
am: ad1e3767d4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1582065 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I87cc0dd2ecb903ecf3aed98b7f538f5030832c92
2021-02-10Upgrade rust/crates/futures-channel to 0.3.12 am: 09da603878 am: 2ea9ccb096Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1582065 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3f500fdfd409e5dc2c9b79f87898a8cc4cf12ed
2021-02-10Upgrade rust/crates/futures-channel to 0.3.12 am: 09da603878Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1582065 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id970ae833607494482efc41ddd7278e9aaaff281
2021-02-09Upgrade rust/crates/futures-channel to 0.3.12Haibo Huang
Test: make Change-Id: I2cd8faf5d73c915d9dfc92c1bf7232e31010c05c
2020-12-15add crosvm to com.android.virt am: 7f19f72930 am: 04a0082c0f am: 4113866dccJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1527739 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I050232d325b3e91cb62e6ef1480b18659fdbac6f
2020-12-15add crosvm to com.android.virt am: 7f19f72930 am: 04a0082c0fJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1527739 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3916214c2fc3c2414b2953fb1b2b89c520d5c41
2020-12-15add crosvm to com.android.virt am: 7f19f72930Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1527739 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic2f62472fbe655751e662bfe6666531a67e93681
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: I706eb8f47ad63a41d8ecd3b6696fb4f9070f258f
2020-11-24Mark ab/6881855 as merged am: ee241f1fd5 am: e99dd1bc37Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/13112879 Change-Id: I07f195f9db9a8357a3f5d4477206775054078ab8
2020-11-24Mark ab/6881855 as merged am: ee241f1fd5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/13112879 Change-Id: I224b937849cc73e5b2c7b996e272688ba2b9d5f8
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I9bf368ee3a75fc8f67451808da49fba6e100a7cf
2020-11-05TEST_MAPPING: test dependers of this crate am: 14f9bb72d7 am: 6fb9bf04b7 am: ↵Jeff Vander Stoep
7f8b4209c1 am: 783a3509af Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1488762 Change-Id: Ie47c9ea63f41dd14ee7cdc56aee4cee89141499f
2020-11-05TEST_MAPPING: test dependers of this crate am: 14f9bb72d7 am: 6fb9bf04b7 am: ↵Jeff Vander Stoep
7f8b4209c1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1488762 Change-Id: I5e06a7002bf7f78053688d7379d5e67fe1e56dc7
2020-11-05TEST_MAPPING: test dependers of this crate am: 14f9bb72d7 am: 6fb9bf04b7Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1488762 Change-Id: I6fbd86b239190c64c298d72ee3a65e37d7bbdfc4
2020-11-05TEST_MAPPING: test dependers of this crate am: 14f9bb72d7Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1488762 Change-Id: I9cbe1ecfbb493a8a2dd78e40f3f88889d8864a11
2020-11-05TEST_MAPPING: test dependers of this crateJeff Vander Stoep
Bug: 168167373 Test: TH Change-Id: I92dfdfd171f1b239c1b683eacdd9399b3bcb3fbd
2020-10-26Upgrade rust/crates/futures-channel to 0.3.7 am: bc88f08969 am: 3d12447361 ↵Chih-Hung Hsieh
am: 84c12e7263 am: 4d7b573ad5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1473736 Change-Id: I7c0797eb5fe9d0600202d75e88af6bf4fce2f743
2020-10-26Upgrade rust/crates/futures-channel to 0.3.7 am: bc88f08969 am: 3d12447361 ↵Chih-Hung Hsieh
am: 84c12e7263 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1473736 Change-Id: If6d3205589f20f8378bd8948ac88f66e62cad60d
2020-10-26Upgrade rust/crates/futures-channel to 0.3.7 am: bc88f08969 am: 3d12447361Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1473736 Change-Id: Iff9fc5e08e7b8db303a599adf748e741fb544338
2020-10-26Upgrade rust/crates/futures-channel to 0.3.7 am: bc88f08969Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1473736 Change-Id: I71f19c1f4dc4489ee86983b9a6add7af39d332ae
2020-10-25Upgrade rust/crates/futures-channel to 0.3.7Chih-Hung Hsieh
Test: make all rust crates Change-Id: Ibf0e97bc81bcbc975ec0c85865ab19f2ef3d8652
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7432ab870b -s ours am: ↵Xin Li
fedcb16381 -s ours am: f7c0372240 -s ours am skip reason: Change-Id Icc9c84c33a4c0cb1e8a9957a2167b713525b98ab with SHA-1 52899af65d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/12797380 Change-Id: I994ac840c6f618c090586b728dad137dcae627b5
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7432ab870b -s ours am: ↵Xin Li
fedcb16381 -s ours am skip reason: Change-Id Icc9c84c33a4c0cb1e8a9957a2167b713525b98ab with SHA-1 52899af65d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/12797380 Change-Id: I8dc8a046f1253af651d0f8c7e64af27eaed728cf
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 7432ab870b -s oursXin Li
am skip reason: Change-Id Icc9c84c33a4c0cb1e8a9957a2167b713525b98ab with SHA-1 52899af65d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/12797380 Change-Id: If283faf6ab18a444a73a87bc52b09ed38a962b59
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Icc9c84c33a4c0cb1e8a9957a2167b713525b98ab Change-Id: I05b81d3e89c523a21dccbf1c16c7d961a51185f8
2020-08-28Fix futures-channel/METADATA am: 5dedceab5a am: 49babae9ee am: dc28ec101c ↵Chih-Hung Hsieh
am: 70f7120dc2 am: 8e7c2c6b2e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1414035 Change-Id: Ia215f0725015fd8acaf4cb929dcf0acd4185ecf7
2020-08-27Fix futures-channel/METADATA am: 5dedceab5a am: 49babae9ee am: dc28ec101c ↵Chih-Hung Hsieh
am: 70f7120dc2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1414035 Change-Id: Ic736a080ef984f4f5cc5bfc4314b73cfc1dc2aa3
2020-08-27Fix futures-channel/METADATA am: 5dedceab5a am: 49babae9ee am: dc28ec101cChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1414035 Change-Id: I247d8e964b6782ad3995754c871df54f8c70f298
2020-08-27Fix futures-channel/METADATA am: 5dedceab5a am: 49babae9eeChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1414035 Change-Id: I4180596945e0e0a1691c3265e5e05cc67af72c3b
2020-08-27Fix futures-channel/METADATA am: 5dedceab5aChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/1414035 Change-Id: Ibf79f622ff3ffa1f423d1b635a08ddd8b5592864