aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-29Snap for 11151698 from c62c5166f24ba15e16d76b6bfc8b2234c7be6239 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I2b2117d7627190d62b5cdb0a00a96364b8856889
2023-11-27Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: ↵Michael Hoisie
2dcb4cebaf am: 08c5695242 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192 Change-Id: I7cc839d6be20eae53580423dea034e139d800f86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: 2dcb4cebafMichael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192 Change-Id: I606c0cef45d97b7b0997735bc91cf8e82ad1bbb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: ↵Michael Hoisie
53b0508632 am: cba0f85242 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192 Change-Id: Ie5219601e53ca4a0755664040e69acbece3a77d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: 53b0508632Michael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192 Change-Id: Ie9cb3e03777e0f605354adbed67ea4990dbcb4ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64bMichael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192 Change-Id: I42bf5f485c98b71fd39cf44469996c7f8eceae0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64bMichael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192 Change-Id: Ic2095f4fe8dbb5f084038cdfc962424553c73ef9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Switch py2-launcher to use libsqlite_static_noicuMichael Hoisie
The 'libsqlite' library for host recently switched on the SQLITE_ENABLE_ICU flag, which now requires ICU libraries to be included in binaries that link libsqlite statically. Because py2-launcher does not need the ICU extensions, switch to using the 'libsqlite_static_noicu' target. Test: m py2-launcher Bug: 308173442 Change-Id: I8ede90d7bd7eb016b05e181a6955ff2d3b770e8f
2022-07-20Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseColin Cross
f956773443 am: 6f11761619 am: baca0a248d am: f4c6431b80 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996 Change-Id: I622b68632379de36ccf2302179caeb74d805011d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: ↵android-u-beta-1-gplmain-16k-with-phonesColin Cross
f956773443 am: 6f11761619 am: baca0a248d Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996 Change-Id: I90de36bade8e4b34d2e5d6cfb60997996bd2a096 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: ↵Colin Cross
f956773443 am: 6f11761619 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996 Change-Id: I7028a0b13c8ab16b9d3a6653320b23d4e966e0b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: f956773443Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996 Change-Id: I80fdfe694532e142384fba73812edd8feb06a082 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fdmain-16kColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996 Change-Id: Ia72ce11dd10b16ad1699bd3908cf11102df603eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19Add aarch64-linux-musl configurations for cpython2Colin Cross
Add configuration files generated on an Ubuntu 22.04 aarch64 host. This uses the host clang for now since we don't have a hermetic arm64 clang. Bug: 236052820 Test: cross compiles Change-Id: I646826e14f1572ba98b857ad17d5a1d56e3decd7
2022-03-16Tweak linux_glibc properties for musl builds in external/python/cpython2 am: ↵Colin Cross
fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4 am: 287db7598d Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538 Change-Id: I1c22be46ec6e8630743d1521f48290d62d53bde7
2022-03-16Tweak linux_glibc properties for musl builds in external/python/cpython2 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Colin Cross
fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538 Change-Id: I9234273096403a530df2cc0645f43db814d7b3e9
2022-03-16Tweak linux_glibc properties for musl builds in external/python/cpython2 am: ↵Colin Cross
fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538 Change-Id: I504c774b2658f204cb371f760e479e8c3a522a9d
2022-03-15Tweak linux_glibc properties for musl builds in external/python/cpython2 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_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_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseColin Cross
fc6603babf am: 5796352143 am: 80d3df0782 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538 Change-Id: I7e1c929900f5e55b71d4118ceaddb663d3892463
2022-03-15Tweak linux_glibc properties for musl builds in external/python/cpython2 am: ↵Colin Cross
fc6603babf am: 5796352143 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538 Change-Id: Icce6090b08352b89bde188aeb4a0d5a919130e58
2022-03-15Tweak linux_glibc properties for musl builds in external/python/cpython2 am: ↵Colin Cross
fc6603babf Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538 Change-Id: I4fc4c1af6f9d531ecebb7fbd53624d2b75424fa1
2022-03-15Tweak linux_glibc properties for musl builds in external/python/cpython2Colin Cross
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: 223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: I1738c5a0e89f5c686eda7fa63da3c2583540dca8
2021-07-29Support compiling python2 against musl am: 66addf4ff3 am: 965ad62600 am: ↵Colin Cross
d9205f3aa7 am: 7e37b457ae Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890 Change-Id: Ia1833daf0bc3036f32d44ce1740ea82671fd6670
2021-07-29Support compiling python2 against musl am: 66addf4ff3 am: 965ad62600 am: ↵Colin Cross
d9205f3aa7 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890 Change-Id: Ib3a9b8120d95b7939bfd85e436503d5dc1f0ac3d
2021-07-29Support compiling python2 against musl am: 66addf4ff3 am: 965ad62600android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890 Change-Id: If954f3a00b9b92e36de7a36cd3f3b4caf7ec098b
2021-07-29Support compiling python2 against musl am: 66addf4ff3Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890 Change-Id: I6c0798ecab9e51dc9b2d04bc2a13a6dce05a4416
2021-07-23Support compiling python2 against muslandroid-s-beta-5android-s-beta-5Colin Cross
Bug: 190084016 Test: m out/soong/host/linux-x86/bin/py2-run with musl Change-Id: Idf35d26fe79e69fcaee4b9981fef7aae9b1c7f60
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I5236888f59fc42b96bad4b2d02d2bbf59c3bd6ae
2021-03-09[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: ↵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-releaseBob Badour
7f55bcf565 am: b6a64965e7 am: d5d7eafa27 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I200627dc87610ee410e3bda8771ab34cbc8ce018
2021-03-09[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: ↵Bob Badour
7f55bcf565 am: b6a64965e7 am: d5d7eafa27 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ice0c7f9f9c999580a1be3a896166cff608614163
2021-03-09[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: ↵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-releaseBob Badour
7f55bcf565 am: b6a64965e7 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id18b45b9a1c53b8131a0be3399e3cce3d64afa05
2021-03-09[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: ↵Bob Badour
7f55bcf565 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iacf81b3683a132dca38a35e8f784e43830097eb4
2021-03-09[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667android-s-beta-4android-s-beta-3android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3119fdded4a6782f9b704bf9923f449b889b3ff0
2021-03-08[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2android-s-beta-2android-s-beta-1Bob Badour
Added SPDX-license-identifier-0BSD SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CC0-1.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-MIT SPDX-license-identifier-MPL SPDX-license-identifier-PSF-2.0 SPDX-license-identifier-Zlib legacy_by_exception_only legacy_notice legacy_unencumbered to: Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 SPDX-license-identifier-Zlib legacy_by_exception_only legacy_notice legacy_unencumbered to: Lib/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib9a78084c97317eb0dbe19af9df3fba919205c3b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ↵Xin Li
ours am: 1c865c3b9e -s ours am: 411c271dbc -s ours am skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6710c19059beec808202e4f83e51349ca1891508
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ↵Xin Li
ours am: 1c865c3b9e -s ours am: 411c271dbc -s ours am skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96c0d8759f90acd5183b8e3cb4b79c903e0bb2fd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ↵Xin Li
ours am: 1c865c3b9e -s ours am skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62f5bf5a1ff5597048775878cdc3086fb9e9e1a2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s oursXin Li
am skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc775eaafaa0e469cd1c883d2f9493a1b139038c
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 Change-Id: I4b6a65d857b9308364f7615af8c71be6e2e6d6a8
2020-11-24Mark ab/6881855 as merged am: ebadebeec5 am: f080cbbb54Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/13109963 Change-Id: If989faf702c633a4c728e449bfd47fc3c37fcd69
2020-11-24Mark ab/6881855 as merged am: ebadebeec5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/13109963 Change-Id: I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ifde318c142c5cdfcb116079229543bb16cefeb10
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8273a56a6d -s ours am: ↵Xin Li
9c52ed6e0a -s ours am: 1af853fc97 -s ours am skip reason: Change-Id I1e0eff19b3ff3c1525914b569947413b05073528 with SHA-1 369499f7b9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/12797375 Change-Id: Ieded72627b634c082683c1735cd55f64f01dbc60
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8273a56a6d -s ours am: ↵Xin Li
9c52ed6e0a -s ours am skip reason: Change-Id I1e0eff19b3ff3c1525914b569947413b05073528 with SHA-1 369499f7b9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/12797375 Change-Id: I663ff4571790059ff36bc404c605039ef3563603
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 8273a56a6d -s oursXin Li
am skip reason: Change-Id I1e0eff19b3ff3c1525914b569947413b05073528 with SHA-1 369499f7b9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/12797375 Change-Id: I355bcfa9398d547de7cc5189de11786e13a79a3d
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1e0eff19b3ff3c1525914b569947413b05073528 Change-Id: I3b2a547ebefbff373e986ed331c685e020706101
2020-09-22Merge "Add -Wno-strict-prototypes to suppress new warnings." am: 30b69e13b4 ↵Stephen Hines
am: a6124811ee am: 45e205b144 am: 2e2c6f2c87 am: 005ef17c23 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104 Change-Id: If9baaebb0867a9aad62f946be2cb9368a0e1117b
2020-09-22Merge "Add -Wno-strict-prototypes to suppress new warnings." am: 30b69e13b4 ↵Stephen Hines
am: a6124811ee am: 45e205b144 am: 2e2c6f2c87 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104 Change-Id: I0f5a120d35e5aa536822ac7d1e61d8cd778148a1
2020-09-22Merge "Add -Wno-strict-prototypes to suppress new warnings." am: 30b69e13b4 ↵Stephen Hines
am: a6124811ee am: 45e205b144 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104 Change-Id: I3c5dbc2fccfad6390212c1db74345083ce83c3b4
2020-09-22Merge "Add -Wno-strict-prototypes to suppress new warnings." am: 30b69e13b4 ↵Stephen Hines
am: a6124811ee Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104 Change-Id: Ie20f812857a32c00148817d9d57c60235924c657
2020-09-22Merge "Add -Wno-strict-prototypes to suppress new warnings." am: 30b69e13b4Stephen Hines
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104 Change-Id: Id70ecba65b329795481494429d5724341ee7644e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 15:55:42 +0000