aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-04Snap for 11174750 from bd827552ad451c5d31cd795454e3ffb0d5853d1a to ↵aml_ads_341615050aml_ads_341517040aml_ads_341413000android14-mainline-adservices-releaseAndroid Build Coastguard Worker
mainline-adservices-release Change-Id: I4b74b6ea272bfe8327f65cee2497695a31e7ecb3
2023-11-09Add build target for kotlinx-coroutines-rx2Alan Viverette
Bug: 293507234 Test: m kotlinx-coroutines-rx2 (cherry picked from https://android-review.googlesource.com/q/commit:1b8434ec7e8159a7513a3458621a77d7f84cec59) Merged-In: Ie2b000146a2004a393ab8bb851dfff9b3a317091 Change-Id: Ie2b000146a2004a393ab8bb851dfff9b3a317091
2023-07-07Snap for 10453563 from 5c53be67b175ad7e14696616563e8cba22231505 to ↵aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050Android Build Coastguard Worker
mainline-adservices-release Change-Id: Iec0fb802ffa29b078607a98dd9d52401a9e37b1e
2023-05-01Add build target for kotlinx-coroutines-guava am: 5631454799Alan Viverette
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/22955996 Change-Id: I5bd31338e79dbabb6950f3f6099b92a48f5c3b03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01Add build target for kotlinx-coroutines-guavaandroid14-devAlan Viverette
Bug: 279668497 Test: m kotlinx_coroutines_guava Change-Id: I8189e900e6c0aded5ff6fa7073b79e2360445476 Merged-In: I8189e900e6c0aded5ff6fa7073b79e2360445476
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2872e331ae -s ours am: ↵Xin Li
ede9d000b1 -s ours am: 30ed56722e -s ours am: 779449a1fa -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 73b7fd0342 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2487135 Change-Id: I6b3483129133afc0183813f004fb51bbcd51ac67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2872e331ae -s ours am: ↵Xin Li
ede9d000b1 -s ours am: 30ed56722e -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 73b7fd0342 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2487135 Change-Id: I3d0aa5dc542186ac1fb60804206daaff0a342024 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 2872e331ae -s ours am: ↵Xin Li
ede9d000b1 -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 73b7fd0342 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2487135 Change-Id: Ic26b2b007a2d9528fc5e6c0de478c14281d8988f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 2872e331ae -s oursXin Li
am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 73b7fd0342 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2487135 Change-Id: Ieca2f4d1e048996fe3b8aef22bec16547c1db4e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Change-Id: I7361f25ffe90c48d68192bf890acc8fccfb4611b
2023-02-08Fix build error am: 349a38c9e0 am: 5f2b8a2912Lincoln Atkinson
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/21325079 Change-Id: I8f40d9574cb2a5aca37f3820ad6be6b2dfad8536 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08Fix build error am: 349a38c9e0Lincoln Atkinson
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/21325079 Change-Id: I7f63d053008651ff90e96bc132c2d662ec00c3e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07Fix build errorandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseLincoln Atkinson
Test: no longer receiving visibility error during Wear build Bug: 259131112 Change-Id: Ic73f9123bc2834ddcfa6d4e55461d96e03b9096a Merged-In: Ic73f9123bc2834ddcfa6d4e55461d96e03b9096a (cherry picked from commit c7bdfa688bad235e2f8e318358e6608ecc56e5f3)
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
2da232539e -s ours am: 785c9cca30 -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 ca095beaca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20956545 Change-Id: I7448a6bcb8361d3db3e3672980962df4b31c6a6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
2da232539e -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 ca095beaca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20956545 Change-Id: I4d4a45af46c3f45a0b85d7781ede9b91a449cbb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Change-Id: Ibe0a2af016b0c7e9e9935e190f3d8938e48b3871
2022-11-18[automerger skipped] Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ↵Steve Elliott
73b7fd0342 am: 4ac0c760bb -s ours am: 228096f806 -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 ca095beaca is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2164368 Change-Id: Iba6c1a031e4d00857677cc52f79ac01c5903a6bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[automerger skipped] Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ↵Steve Elliott
73b7fd0342 am: 4ac0c760bb -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 ca095beaca is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2164368 Change-Id: Ie5695d903120b4f3e1b59fb515e8417f10e24689 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: 73b7fd0342main-16k-with-phonesSteve Elliott
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2164368 Change-Id: Icbfbc2606571e50b5873edf282d44b18c218112b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17Merge tag '1.6.4' into kotlinx.coroutines-upgradeSteve Elliott
Bug: 239834928 Change-Id: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Test: manual -- all existing tests and builds should pass
2022-11-01[automerger skipped] Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ↵Steve Elliott
ca095beaca am: 4a4b72a4e4 -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 01d0a5b0c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/19416732 Change-Id: Ifbcf21fda4cbad6fda8aaff39bc9557b6a9cf235 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ca095beacaSteve Elliott
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/19416732 Change-Id: I7bbdf6da762a3738aa0eee09812cee3d7d8b2669 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31[automerger skipped] Statically include kotlinx_coroutines into ↵Colin Cross
kotlinx_coroutines_android am: 70e65157e5 -s ours am: 5be8550244 -s ours am skip reason: Merged-In I86cfd735d57b319b7dc362d8dd425cf8dff237d6 with SHA-1 f174609ee2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20304651 Change-Id: I8efb42c584db3b3ba8ffe6356f240025c0ff8520 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31[automerger skipped] Update sdk_version of kotlinx-coroutines am: 4963ba0ae9 ↵Cole Faust
-s ours am: 4efa0f9bc9 -s ours am skip reason: Merged-In Ie15d315a4396c539b5d3f8c903252c990c5274c7 with SHA-1 6ee49c7d05 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20304649 Change-Id: Ic8f66ed5e12dee7cc95a37325274a3d790c2fffb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31[automerger skipped] Statically include kotlinx_coroutines into ↵Colin Cross
kotlinx_coroutines_android am: 70e65157e5 -s ours am skip reason: Merged-In I86cfd735d57b319b7dc362d8dd425cf8dff237d6 with SHA-1 f174609ee2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20304651 Change-Id: I08efa839a001904e7e28425c638a5be40941a0bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31[automerger skipped] Update sdk_version of kotlinx-coroutines am: 4963ba0ae9 ↵Cole Faust
-s ours am skip reason: Merged-In Ie15d315a4396c539b5d3f8c903252c990c5274c7 with SHA-1 6ee49c7d05 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20304649 Change-Id: I2b52d0829529337f73edbe314956906d54fa9d65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28Merge tag '1.6.4' into kotlinx.coroutines-upgradeSteve Elliott
Bug: 239834928 Change-Id: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Test: manual -- all existing tests and builds should pass
2022-10-28Statically include kotlinx_coroutines into kotlinx_coroutines_androidColin Cross
kotlinx_coroutines_android classes reference kotlinx_coroutines classes, and including kotlinx_coroutines_android without kotlinx_coroutines causes missing classes warnings in R8. Statically include kotlinx_coroutines into kotlinx_coroutines_android. Bug: 239834928 Bug: 247635736 Test: m CtsTranscodeTestAppSupportsHevc Change-Id: I86cfd735d57b319b7dc362d8dd425cf8dff237d6 Merged-In: I86cfd735d57b319b7dc362d8dd425cf8dff237d6
2022-10-28Update sdk_version of kotlinx-coroutinesCole Faust
So that it compiles for Jvm version 11, and doesn't hit issues inlining it's code into other Jvm 11 code. Bug: 239834928 Bug: 69160377 Bug: 236431222 Test: Treehugger Change-Id: Ie15d315a4396c539b5d3f8c903252c990c5274c7 Merged-In: Ie15d315a4396c539b5d3f8c903252c990c5274c7
2022-10-18[automerger skipped] Update arguments for kotlin 1.7.0 am: 53eee30fe7 -s ↵Colin Cross
ours am: 3e107f9159 -s ours am skip reason: Merged-In I516d54ed009cf2800781006afcb5f340f9d1e32d with SHA-1 614fe960d4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20140393 Change-Id: I12a641ed32aec9f0f47fb4a9733091567f685749 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17[automerger skipped] Update arguments for kotlin 1.7.0 am: 53eee30fe7 -s oursColin Cross
am skip reason: Merged-In I516d54ed009cf2800781006afcb5f340f9d1e32d with SHA-1 614fe960d4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20140393 Change-Id: I77b3a863a48ee112c4a0f83bc2c43b5049c98c94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07Update arguments for kotlin 1.7.0Colin Cross
Replace -Xuse-experimental with -opt-in. Bug: 216136346 Test: builds Change-Id: I516d54ed009cf2800781006afcb5f340f9d1e32d (cherry picked from commit 614fe960d4342c43869a56e207247e77eaa93a81) Merged-In: I516d54ed009cf2800781006afcb5f340f9d1e32d
2022-10-07Merge tag '1.6.4' into kotlinx.coroutines-upgradeSteve Elliott
Bug: 239834928 Change-Id: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Test: manual -- all existing tests and builds should pass
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: da257f8d2e ↵Xin Li
am: c06a7672e0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20130334 Change-Id: Icafa3af34a5c8141322aba7e74c624fc79793e69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: da257f8d2eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20130334 Change-Id: I46cfbe75e2e471220b3cd12470acb4066e191e40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as mergedXin Li
Change-Id: I9127d99eae4efde3b7268de40d35f3b9c0662762
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737a am: ↵Treehugger Robot
773b5b1596 am: 78ab32e1f2 am: ea2b734f6c Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I9922f1c50d2e5b18d8a32591be2fe1bf9e79461a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737a am: ↵Treehugger Robot
773b5b1596 am: 78ab32e1f2 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: Ief73ffcf0eebff760b3c0ae622c4bc8acfe79b3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737a am: ↵Treehugger Robot
773b5b1596 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I2a06f98d68f93bd6fe984e1af7e865a51ad3fd55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I66852b913cf312b3dd522d400afced7246d56daa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I469cddcee5211d892bc8320bf2c1922ceb8340f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0"Treehugger Robot
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 am: eedef2ebdd am: 6f482f2404 am: 0340750f15 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: Ie9b6c0166d2c364504b05839f593c537da22ebb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 am: eedef2ebdd am: 6f482f2404 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: I709f59fea3d1fe225cc3608602eee5a473d349cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 am: eedef2ebdd Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: I93fa9f38b037ed45482d1d5be6843647716f1b4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: Ifc83ee248a5f4b395e5262b18956efd76642705c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: Ia0718f32fb63380e0e6e9c53af5384161abf7829 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22Statically include kotlinx_coroutines into kotlinx_coroutines_androidColin Cross
kotlinx_coroutines_android classes reference kotlinx_coroutines classes, and including kotlinx_coroutines_android without kotlinx_coroutines causes missing classes warnings in R8. Statically include kotlinx_coroutines into kotlinx_coroutines_android. Bug: 247635736 Test: m CtsTranscodeTestAppSupportsHevc Change-Id: I86cfd735d57b319b7dc362d8dd425cf8dff237d6
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade" am: 7a8f34fdda ↵Nattharat Jariyanuntanaet
am: 7897509e87 am: 5746ab4999 am: af99ed0683 am: 25d3463a40 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2163825 Change-Id: Idc1ce303fcd683589d232d897149f5294e3e1b25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade" am: 7a8f34fdda ↵Nattharat Jariyanuntanaet
am: 7897509e87 am: 5746ab4999 am: af99ed0683 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2163825 Change-Id: I4c9e5075c5e8d2917a7084451941ab14538fa585 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 04:55:28 +0000