aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-09Merge "Upgrade curl to curl-7_80_0" am: 109872d534 am: 5c5a0819f5 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-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-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Elliott Hughes
361bd2eee1 am: bf130f24c2 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1913847 Change-Id: I5b999a834d04fa6a86bd2940489915c015df311e
2021-12-08Merge "Upgrade curl to curl-7_80_0" am: 109872d534 am: 5c5a0819f5 am: 361bd2eee1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1913847 Change-Id: I74550aa321c1105a0fec5afa790739f6bf390779
2021-12-08Merge "Upgrade curl to curl-7_80_0" am: 109872d534 am: 5c5a0819f5Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1913847 Change-Id: I47fbd121d3a915126d0e93d20d7df0a662136386
2021-12-08Merge "Upgrade curl to curl-7_80_0" am: 109872d534android-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-1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1913847 Change-Id: Ic1dbdf87138b019033e7c0baa8d3ec10760dd3fe
2021-12-08Merge "Upgrade curl to curl-7_80_0"Elliott Hughes
2021-12-07Upgrade curl to curl-7_80_0Elliott Hughes
Test: make Change-Id: I2f2b36867c508812b89f1c8662960150f6b050d4
2021-10-28Merge "[androidconfigure] Read current clang version instead of hardcoding" ↵Treehugger Robot
am: a9bd6e759e am: eb5a07ecd3 am: 98e215f47f am: 80fd9f6e75 am: 849082a608 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775 Change-Id: If4b7d31218a6d9f558b301016a630e788f3cf9e5
2021-10-28Merge "[androidconfigure] Read current clang version instead of hardcoding" ↵Treehugger Robot
am: a9bd6e759e am: eb5a07ecd3 am: 98e215f47f am: 80fd9f6e75 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775 Change-Id: I2b48ff70cafcc8dae6903809e9cebb09e89062f1
2021-10-28Merge "[androidconfigure] Read current clang version instead of hardcoding" ↵Treehugger Robot
am: a9bd6e759e am: eb5a07ecd3 am: 98e215f47f Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775 Change-Id: Iff6a27b2631f636ac0cc040c17bd41829f86227e
2021-10-28Merge "[androidconfigure] Read current clang version instead of hardcoding" ↵Treehugger Robot
am: a9bd6e759e am: eb5a07ecd3 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775 Change-Id: I6225f1cd0eba807ed16a0b2783af610e3e8e9a0b
2021-10-28Merge "[androidconfigure] Read current clang version instead of hardcoding" ↵Treehugger Robot
am: a9bd6e759e Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1872775 Change-Id: I0cb906031fa7a69e6517ca9d274eebabbc4a4418
2021-10-28Merge "[androidconfigure] Read current clang version instead of hardcoding"Treehugger Robot
2021-10-27[androidconfigure] Read current clang version instead of hardcodingPirama Arumuga Nainar
build/soong/scripts/get_clang_version.py prints the current clang version used in the platform. Test: ./androidconfigure finds the correct clang version. Change-Id: If8da3dfb04bd194851611768aaa2166d7a552c99
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: c46644915e -s ours am: 42957c926e -s ours am: 28564d0420 -s ours am: c8d2a1d228 -s ours am skip reason: Merged-In I148c3abd6861bccd906314d3cc02a5009a20e0b9 with SHA-1 588f576a93 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/curl/+/15570654 Change-Id: Id53e6b15372ec7705bddae84bf296182374ee796
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: c46644915e -s ours am: 42957c926e -s ours am: 28564d0420 -s ours am skip reason: Merged-In I148c3abd6861bccd906314d3cc02a5009a20e0b9 with SHA-1 588f576a93 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/curl/+/15570654 Change-Id: I27b8a33b7777e957c3758ee92ae1e62096215af9
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: c46644915e -s ours am: 42957c926e -s ours am skip reason: Merged-In I148c3abd6861bccd906314d3cc02a5009a20e0b9 with SHA-1 588f576a93 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/curl/+/15570654 Change-Id: Ibb3f67a29af3eea7906284eeb423ebfa39cc3f81
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: c46644915e -s ours am skip reason: Merged-In I148c3abd6861bccd906314d3cc02a5009a20e0b9 with SHA-1 588f576a93 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/curl/+/15570654 Change-Id: I38df495757be6c2dff417303b46bd5404a22218d
2021-08-14Mark sc-dev-plus-aosp-without-vendor@7634622 as mergedandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Merged-In: I148c3abd6861bccd906314d3cc02a5009a20e0b9 Change-Id: I41cd001ee9dc020affe2c496cd4c4eda22885319
2021-08-13Merge "Add CPE for curl." am: a7013945a1 am: b32c0ee907 am: 53fa73c942 am: ↵Treehugger Robot
6317f101b4 am: 19b668cfa9 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1795007 Change-Id: I88fd51c88f121d5ec9c84947fcb5287a818bd07d
2021-08-13Merge "Add CPE for curl." am: a7013945a1 am: b32c0ee907 am: 53fa73c942 am: ↵Treehugger Robot
6317f101b4 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1795007 Change-Id: I2add894ad76afea582245cfe02403dd10796d42e
2021-08-13Merge "Add CPE for curl." am: a7013945a1 am: b32c0ee907 am: 53fa73c942Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1795007 Change-Id: Iecddce8a74c51e3c92efecd2c4e51cd5e775ec8b
2021-08-13Merge "Add CPE for curl." am: a7013945a1 am: b32c0ee907Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1795007 Change-Id: I3f525661afd25a1efb0be658180b7ef7c2301c2f
2021-08-13Merge "Add CPE for curl." am: a7013945a1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1795007 Change-Id: I2511c2204da4c779afeb975a517719eb6c348e6a
2021-08-13Merge "Add CPE for curl."android-s-beta-5android-s-beta-5Treehugger Robot
2021-08-12Merge "Upgrade curl to curl-7_78_0" am: a883f21446 am: ef704dd8b1 am: ↵Elliott Hughes
50060f96e5 am: 0ade124396 am: 4d43d51792 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792488 Change-Id: Ica8ed0c690acd119b13473b9476fd489062ecb40
2021-08-12Merge "Upgrade curl to curl-7_78_0" am: a883f21446 am: ef704dd8b1 am: ↵Elliott Hughes
50060f96e5 am: 0ade124396 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792488 Change-Id: Ic4b46e54824475006168357d00e891bb4541aa7e
2021-08-12Merge "Upgrade curl to curl-7_78_0" am: a883f21446 am: ef704dd8b1 am: 50060f96e5Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792488 Change-Id: I72bc255ef093678e5b6174af70e7a1ae5203bff8
2021-08-12Merge "Upgrade curl to curl-7_78_0" am: a883f21446 am: ef704dd8b1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792488 Change-Id: I9049d05ba5dda2332751236cf05d603df474f3e7
2021-08-12Merge "Upgrade curl to curl-7_78_0" am: a883f21446Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792488 Change-Id: Ia789227948176fedc71b38fc1c9d86d729a64bd6
2021-08-12Add CPE for curl.Michael Jezierny
Fixes: 194342713 Change-Id: I0fe27035371fd6125befe7709320df25fccaa799 Test: no tests, just updating metadata about source code
2021-08-12Merge "Upgrade curl to curl-7_78_0"Elliott Hughes
2021-08-11Merge "Update OWNERS." am: c3f79959db am: 3efb35f56e am: 588f576a93 am: ↵Treehugger Robot
2f87aef763 am: 7a91e7f377 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792792 Change-Id: Ic6c1c97daa620ab3ccb25e50a58213ac23694a14
2021-08-11Merge "Update OWNERS." am: c3f79959db am: 3efb35f56e am: 588f576a93 am: ↵Treehugger Robot
2f87aef763 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792792 Change-Id: I78cb035b506ad75c2a04a7e352cc239291e3fc6c
2021-08-11Merge "Update OWNERS." am: c3f79959db am: 3efb35f56e am: 588f576a93Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792792 Change-Id: Ic5299dfa2e8577af7c13d175a4feef38253b246a
2021-08-11Merge "Update OWNERS." am: c3f79959db am: 3efb35f56eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792792 Change-Id: I148c3abd6861bccd906314d3cc02a5009a20e0b9
2021-08-11Merge "Update OWNERS." am: c3f79959dbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1792792 Change-Id: I53abe7271c0095137100b7be8a6f018ea30387dc
2021-08-11Merge "Update OWNERS."Treehugger Robot
2021-08-10Update OWNERS.Elliott Hughes
Test: N/A Change-Id: I1bd8cc61611712eb3dbce003dbc50eb0ea8356a2
2021-08-10Upgrade curl to curl-7_78_0Elliott Hughes
Test: make Change-Id: Icd602cfe251ab2fcd31320b08894b303d1a824d8
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I138896c472d1ff85569ce2d06d6e2451d24c32c1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf34b26fcb -s ↵Xin Li
ours am: a5a724f6be -s ours am: bd9b482ee5 -s ours am skip reason: Change-Id I1514c05420a2558cdee2a88fcd5ddb7752d15267 with SHA-1 4773a27c1a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c0be6f1cb58d65b2ee14a51279fa274cd4f2a88
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf34b26fcb -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: a5a724f6be -s ours am: bd9b482ee5 -s ours am skip reason: Change-Id I1514c05420a2558cdee2a88fcd5ddb7752d15267 with SHA-1 4773a27c1a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c4d8ddc3cd2ad613495b89afd410b766bf67c30
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf34b26fcb -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid12--mainline-releaseXin Li
ours am: a5a724f6be -s ours am skip reason: Change-Id I1514c05420a2558cdee2a88fcd5ddb7752d15267 with SHA-1 4773a27c1a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd36c033bbdbf3b8dfbc536252f826795ecd7561
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cf34b26fcb -s oursXin Li
am skip reason: Change-Id I1514c05420a2558cdee2a88fcd5ddb7752d15267 with SHA-1 4773a27c1a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8bbf4a894638ab7ba2612a512511e85621627c3e
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I1514c05420a2558cdee2a88fcd5ddb7752d15267 Change-Id: Ic905c52c635ee5ff2bc33a16013ad1692c04278d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/curl" am: 7d224aa171 am: ↵Bob Badour
bdb05c5784 am: 5089f984eb am: d6c45494fe Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1588832 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaace6ebcc1a594f235a232447265e384368a5cae
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/curl" am: 7d224aa171 am: ↵Bob Badour
bdb05c5784 am: 5089f984eb am: d6c45494fe Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1588832 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4d5b1a4aba9015d4899b04c4cccd60fd002abf7e
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/curl" am: 7d224aa171 am: ↵Bob Badour
bdb05c5784 am: 5089f984eb Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1588832 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd679c8941165d8f81a8b04f6e48ae3b6d5d7b31
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/curl" am: 7d224aa171 am: ↵Bob Badour
bdb05c5784 Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1588832 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6ab6d275f4018807010044fafea4926e9079afde
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/curl" am: 7d224aa171Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1588832 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea80af2a19f10b96a633b758f08d9d5922d40f56
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 02:35:43 +0000