aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-12Snap for 7910331 from aae8339fbc01d351b2a43e864eecf6e7bb79dbb0 to ↵android-mainline-12.0.0_r92android-mainline-12.0.0_r78android-mainline-12.0.0_r50android12-mainline-neuralnetworks-releaseAndroid Build Coastguard Worker
mainline-neuralnetworks-release Change-Id: Ia58942ec3063cfa026a18cd4cb98cecc98e51583
2021-06-23Make libfutures available to DnsResolverandroid-mainline-12.0.0_r99android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r49android-mainline-12.0.0_r40android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r32android-mainline-12.0.0_r25android-mainline-12.0.0_r23android-mainline-12.0.0_r20android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r114android-mainline-12.0.0_r110android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r100aml_wif_311811030aml_tet_311811050aml_sdk_311710000aml_pco_311011000android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-releaseTreehugger Robot
Test: TH Bug 155855709 Original-Change: https://android-review.googlesource.com/1742081 Merged-In: Iaa62fbc01e96a9cba19c3353bf7b64ff45dd21d1 Change-Id: Iaa62fbc01e96a9cba19c3353bf7b64ff45dd21d1
2021-04-28Generate apex_available from c2a instead of a patch am: 6e21a92345 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
b9ecefff4f am: 33e398951a am: 714e5c0e39 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1688688 Change-Id: I35128b69f19f61b3df5e048e60d7d7b9580ea630
2021-04-28Generate apex_available from c2a instead of a patch am: 6e21a92345 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
b9ecefff4f am: 33e398951a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1688688 Change-Id: I3e828bb84b6f3b12bc191e2a1c0c198d59746390
2021-04-28Generate apex_available from c2a instead of a patch am: 6e21a92345 am: ↵Joel Galenson
b9ecefff4f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1688688 Change-Id: Ice88a35774ead4fffc5d50a53541b6d90058fed2
2021-04-28Generate apex_available from c2a instead of a patch am: 6e21a92345Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1688688 Change-Id: Idddb84af2b7e3d4211ee2cc759852ee783bcf4f5
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: I2f0c218bed306244b6043a5868069be1a18dc79c
2021-04-02Upgrade rust/crates/futures to 0.3.13 am: 4c85ef4160 am: 7403409e3d am: ↵Joel Galenson
f0b2ed24dd am: b6265deeb8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1662782 Change-Id: I11d698e7a1f96196f3f96d89c62cc1fa098f070e
2021-04-02Upgrade rust/crates/futures to 0.3.13 am: 4c85ef4160 am: 7403409e3d am: ↵Joel Galenson
f0b2ed24dd Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1662782 Change-Id: I8ab97ff74d6ce681bd640a193fa9c26cc93fa3f8
2021-04-02Upgrade rust/crates/futures to 0.3.13 am: 4c85ef4160 am: 7403409e3dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1662782 Change-Id: Iacd46cbcd3897afb31c5c1eca246deb9c08d3e32
2021-04-02Upgrade rust/crates/futures to 0.3.13 am: 4c85ef4160Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1662782 Change-Id: I3f74a9b90f3e33d53d3d9b65a410669c945372b1
2021-04-01Upgrade rust/crates/futures to 0.3.13Joel Galenson
Test: make Change-Id: I9b1caeeff0ed5d6939500dbc8c214d0959e6a194
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7df35e82e4 -s ↵Xin Li
ours am: 367f9bd68b -s ours am: 797c2a2dd4 -s ours am skip reason: Change-Id I4a5d32ab5bb736b6f04bdf8a38f741d6d13bbadc with SHA-1 f3b63b98a5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I79469c94fa2e005b8bcd4a7677bd83e09340fa82
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7df35e82e4 -s ↵Xin Li
ours am: 367f9bd68b -s ours am skip reason: Change-Id I4a5d32ab5bb736b6f04bdf8a38f741d6d13bbadc with SHA-1 f3b63b98a5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I71bb7a42bf0955793fa8e0c3ed04e9c68c9994fb
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7df35e82e4 -s oursXin Li
am skip reason: Change-Id I4a5d32ab5bb736b6f04bdf8a38f741d6d13bbadc with SHA-1 f3b63b98a5 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id07e5350302baadc54ce2ebd2e437ee617fbf1cd
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I4a5d32ab5bb736b6f04bdf8a38f741d6d13bbadc Change-Id: Ib1e81faeed362f357fc641c8ec390275f0da638e
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures am: 3ef5afd568 ↵Bob Badour
am: 02ddfacdd8 am: ab46f421e3 am: b63eee0ba8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1587406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I44945e7a695d36c16240fea8cca65872d94f0f53
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures am: 3ef5afd568 ↵Bob Badour
am: 02ddfacdd8 am: ab46f421e3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1587406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I71a7e263d72b256bb0bc583f3a87c21c0a651356
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures am: 3ef5afd568 ↵Bob Badour
am: 02ddfacdd8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1587406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idf5a47e9434bb52bc6d8cf4450c0619d3591b86f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futures am: 3ef5afd568Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1587406 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6a246efe55962f8fe940050bc34b97f59f22ad64
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/futuresandroid-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: Ib9881672416e0ab77b2c909948a9490daa751a5a
2021-02-10Upgrade rust/crates/futures to 0.3.12 am: 51d51a0897 am: 089614a74d am: ↵Haibo Huang
64d98f2516 am: b96e4fc9ea Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1582706 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie65d77a9d6549669cce5fe8a2ce0ee55e173fc63
2021-02-10Upgrade rust/crates/futures to 0.3.12 am: 51d51a0897 am: 089614a74d am: ↵Haibo Huang
64d98f2516 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1582706 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I128ecf97a9fdc62d33e5012cc121e891177f9803
2021-02-10Upgrade rust/crates/futures to 0.3.12 am: 51d51a0897 am: 089614a74dHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1582706 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0aefb94d5ee741f499c492de16c0a7e7cef97435
2021-02-10Upgrade rust/crates/futures to 0.3.12 am: 51d51a0897Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1582706 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62d82a5c2f44a69a4d311ceb845aa6c5374441de
2021-02-09Upgrade rust/crates/futures to 0.3.12Haibo Huang
Test: make Change-Id: I32391e03ce49616fb6d619a1d0861faabc38685c
2020-12-15add crosvm to com.android.virt am: 46caea809f am: e7845f95bd am: f3b63b98a5Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1527445 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ba4ae43f9d543e25b6c4b264f47a9dbe1fe3664
2020-12-15add crosvm to com.android.virt am: 46caea809f am: e7845f95bdJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1527445 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a5d32ab5bb736b6f04bdf8a38f741d6d13bbadc
2020-12-15add crosvm to com.android.virt am: 46caea809fJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1527445 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3101f5fa1618ed4497fec505bbde656cc8e277a8
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: I1fae9f3a274220a4b84f635275c43344454454b5
2020-11-24Mark ab/6881855 as merged am: c3a90025af am: 1763fe9395Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures/+/13111228 Change-Id: I00425079cbbc43a80716f519f7417daa13d39fab
2020-11-24Mark ab/6881855 as merged am: c3a90025afXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures/+/13111228 Change-Id: Id09d87f5e66c8952d9194851e16d1f713b821137
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie4be02d8ff9d8fca43f2266ddb26cfd106b6d9b4
2020-10-26Upgrade rust/crates/futures to 0.3.7 am: 32ee67eb39 am: a2b749b930 am: ↵Chih-Hung Hsieh
d30ac35e10 am: 14ab1f92aa Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1473777 Change-Id: Iec4d11deca7418582609172dc34a66c012c54ab7
2020-10-26Upgrade rust/crates/futures to 0.3.7 am: 32ee67eb39 am: a2b749b930 am: ↵Chih-Hung Hsieh
d30ac35e10 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1473777 Change-Id: Icce45cbecfcfb53caefb56e391b712e23ec2160d
2020-10-26Upgrade rust/crates/futures to 0.3.7 am: 32ee67eb39 am: a2b749b930Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1473777 Change-Id: I28750111e2a77d1ce199348c2fcb64a12ae2f28f
2020-10-26Upgrade rust/crates/futures to 0.3.7 am: 32ee67eb39Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1473777 Change-Id: I6d835a3ca6604aa66a1ffd25fb317f257396e981
2020-10-25Upgrade rust/crates/futures to 0.3.7Chih-Hung Hsieh
Test: make all rust crates Change-Id: If97a17007e814752392c4c66508c46a366437f0b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: db6917d375 -s ours am: ↵Xin Li
0f433da177 -s ours am: 50066cf2c9 -s ours am skip reason: Change-Id Ibdf0f9c6aae6a33c7581d1f6187433eea6232bdb with SHA-1 37b1a1188c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures/+/12794547 Change-Id: I159715214c75123cafbc9d2b01322d303e598091
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: db6917d375 -s ours am: ↵Xin Li
0f433da177 -s ours am skip reason: Change-Id Ibdf0f9c6aae6a33c7581d1f6187433eea6232bdb with SHA-1 37b1a1188c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures/+/12794547 Change-Id: Ie1552c1cc4948a8e1c2cd1c7bdb3c604ea222c32
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: db6917d375 -s oursXin Li
am skip reason: Change-Id Ibdf0f9c6aae6a33c7581d1f6187433eea6232bdb with SHA-1 37b1a1188c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures/+/12794547 Change-Id: I2be105e0e0c77ba1aa43bf37477e03c94e26fa5e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ibdf0f9c6aae6a33c7581d1f6187433eea6232bdb Change-Id: I767e6363ef439c1b1302584bbb330c215f307e2c
2020-08-28Fix futures/METADATA am: 1b4e3c7999 am: ed9fc8e7e1 am: 00b23eb1e9 am: ↵Chih-Hung Hsieh
527165c610 am: a65dcd7adc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1414089 Change-Id: I8934c3c0898a7f8dd10ab6bfa2b3d97d64334c60
2020-08-27Fix futures/METADATA am: 1b4e3c7999 am: ed9fc8e7e1 am: 00b23eb1e9 am: 527165c610Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1414089 Change-Id: I9d3d60a39ca4afb04b4e0e4dea526b87bf027f7b
2020-08-27Fix futures/METADATA am: 1b4e3c7999 am: ed9fc8e7e1 am: 00b23eb1e9Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1414089 Change-Id: Ib5d5e6e1b8fe906d67884c96dd85ce7f5a38969c
2020-08-27Fix futures/METADATA am: 1b4e3c7999 am: ed9fc8e7e1Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1414089 Change-Id: I7c13a9d0bfe290aa534554bd8c66eee8f15b10ed
2020-08-27Fix futures/METADATA am: 1b4e3c7999Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1414089 Change-Id: I34b628227129d04d5359289405c07c7f27020f50
2020-08-25Fix futures/METADATAChih-Hung Hsieh
Bug: 166324735 Test: make Change-Id: I11a131f3d6f0909464923f0403f238ae5839708f
2020-07-14Regenerate Android.bp with new cargo2android.py am: 87830524cc am: ↵Chih-Hung Hsieh
3a71b093f2 am: b0f99665c4 am: 37b1a1188c am: 0af1af7802 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1360839 Change-Id: Ic6583df588c7c0acd1923499755a4c623b6c97fb
2020-07-14Regenerate Android.bp with new cargo2android.py am: 87830524cc am: ↵Chih-Hung Hsieh
3a71b093f2 am: b0f99665c4 am: 37b1a1188c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1360839 Change-Id: Ibe62578d127a8efe2a1dbd005c3436300f6a8dd3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 20:58:54 +0000