aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-12gh-116472: Replace literal newlines with escape characters in MSBuild files ↵HEADmastermainMiss Islington (bot)
(GH-116473) (cherry picked from commit 5d0cdfe519e6f35ccae1a1adca1ffd7fac10cee0) Co-authored-by: Dan Albert <dan@gingerhq.net> (cherry picked from commit 22c38a6f77577fe0018f53242a9d534725eed5ca) Change-Id: I3767a0e13027ede5216e9db9ba87dc3730deaae1
2023-11-28Switch py3-launcher to use libsqlite_static_noicu am: af59c6b2a0 am: ↵Michael Hoisie
fb37cee0d8 am: 110ada9e69 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2848018 Change-Id: I61793ca0544251db5f823d4af436b79068c903e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Switch py3-launcher to use libsqlite_static_noicu am: af59c6b2a0 am: ↵Michael Hoisie
712add4742 am: 96a717ae6b Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2848018 Change-Id: I43926fa0db0b75dc6cc96cf27cc4556a20278f3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Switch py3-launcher to use libsqlite_static_noicu am: af59c6b2a0 am: fb37cee0d8Michael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2848018 Change-Id: I3cc50114a5f08abc555679ca8447715f5a70e0a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Switch py3-launcher to use libsqlite_static_noicu am: af59c6b2a0 am: 712add4742Michael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2848018 Change-Id: Ia72d3c2a7fcd24a617d3e4b269a1b2b51347246c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Switch py3-launcher to use libsqlite_static_noicu am: af59c6b2a0Michael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2848018 Change-Id: I148ecbd76a0caeb8c3a0dba5aff87a08cbf9383e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Switch py3-launcher to use libsqlite_static_noicu am: af59c6b2a0Michael Hoisie
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2848018 Change-Id: Iaef58469999accfabc3d636a6dba689fd33379e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Switch py3-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 py3-launcher does not need the ICU extensions, switch to using the 'libsqlite_static_noicu' target. Test: m py3-launcher-autorun Bug: 308173442 Change-Id: If9165a1c8afaed693cf2e0c95ecad9d6b3a21670
2023-09-01Add bz2 and elementtree modules. am: 57d51f2bf6 am: 991af89d2c am: ↵James Farrell
2cba696386 am: f18e3d8345 am: d7073590e2 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2736473 Change-Id: I3009b5a9836afe85e02d31dab3b07c80babfdd98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Add bz2 and elementtree modules. am: 57d51f2bf6 am: 991af89d2c am: ↵James Farrell
2cba696386 am: f18e3d8345 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2736473 Change-Id: Ifa49c5a7f6fd976e5ce2bfc1f0c712329342e284 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Add bz2 and elementtree modules. am: 57d51f2bf6 am: 991af89d2c am: 2cba696386James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2736473 Change-Id: Id9b65a137c15fb980731027aace2a63bd350011f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Add bz2 and elementtree modules. am: 57d51f2bf6 am: 991af89d2cJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2736473 Change-Id: Iae9d2cc31c3d65048b051dbae9be99bc1e4a00ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Add bz2 and elementtree modules. am: 57d51f2bf6James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2736473 Change-Id: I436b76a108f2ad1b8c5d9f9fce3d22ae19b73b2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Add bz2 and elementtree modules.James Farrell
Bug: 278602456 Change-Id: I4fd21c106f9c7eacad6bd131e8db7a1000fb06b6
2023-08-25Merge "Fix mac build" into main am: 4d2f5cd0cd am: 73ff4d820b am: 323cb0cc2d ↵Treehugger Robot
am: 3fba2f7ec9 am: dabafe38c7 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2725953 Change-Id: I4d59ac9a100029a2cc5803e9b09d25e50b7a70d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge "Fix mac build" into main am: 4d2f5cd0cd am: 73ff4d820b am: 323cb0cc2d ↵Treehugger Robot
am: 3fba2f7ec9 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2725953 Change-Id: I68b7e1c0e8f042e65cd4d7b8fdc2f5c153a82f51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge "Fix mac build" into main am: 4d2f5cd0cd am: 73ff4d820b am: 323cb0cc2dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2725953 Change-Id: I22695465aff9ec6881d7d580832e50dedee6221b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge "Fix mac build" into main am: 4d2f5cd0cd am: 73ff4d820bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2725953 Change-Id: I6213d61e07dde033e93e11abdcd339735e1c2dd5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Fix kokoro darwin build. am: 908b351117 am: 9fbfed13f3 am: f6f4d3c284 am: ↵James Farrell
8cafe2da45 am: 9e3fbafa71 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2726053 Change-Id: I8aa58e35f6eab0ae1bccf82f57475e8b15836065 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge "Fix mac build" into main am: 4d2f5cd0cdTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2725953 Change-Id: Ic01e466932fbdd5c8cc1953d89f77b47da27e164 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge "Fix mac build" into mainTreehugger Robot
2023-08-24Fix kokoro darwin build. am: 908b351117 am: 9fbfed13f3 am: f6f4d3c284 am: ↵James Farrell
8cafe2da45 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2726053 Change-Id: Ied4cdd8bac925a03ac0d63662619623599f6d440 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Fix kokoro darwin build. am: 908b351117 am: 9fbfed13f3 am: f6f4d3c284James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2726053 Change-Id: I52214485efc99f24add3fd6397d42b0c45015436 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Fix kokoro darwin build. am: 908b351117 am: 9fbfed13f3James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2726053 Change-Id: Ife89e5166ee3bcf6c160703a1120b96305971688 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Fix kokoro darwin build. am: 908b351117James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2726053 Change-Id: I1054c185b667e22f850356dda461231877037db3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Fix kokoro darwin build.James Farrell
Bug: 278602456 Change-Id: I58a7668f2b1e83c7ba8436f54049055e114699f9
2023-08-24Fix mac buildDan Willemsen
The mac config was generated with aosp/2703555 and aosp/2703567 which did not end up submitted yet. Bug: 278602456 Test: compile on mac Change-Id: I3ccbe68ef21ed895bb3d366219906dd9c2c1b0a3
2023-08-24Changes for building Python 3.11 am: f82c4a3bf6 am: 865804ffed am: ↵James Farrell
fa997dac2d am: 96341bf738 am: 7db1cd32c5 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2701697 Change-Id: Id9cbda18795ea18c11ce7d880a01d10f55397d0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge tag 'upstream-v3.11.4' into python-3.11-v3 am: bb0ccc9b2b am: ↵James Farrell
991954d1f3 am: d53e7f07fd am: 2e44821063 am: c6fcada4ce Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2721686 Change-Id: I75d5574f5735764b7eb2436ba5994fd8283c915f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Changes for building Python 3.11 am: f82c4a3bf6 am: 865804ffed am: ↵James Farrell
fa997dac2d am: 96341bf738 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2701697 Change-Id: Ibea500e5d6a6164edf28cd506eb3f2acfe29e591 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge tag 'upstream-v3.11.4' into python-3.11-v3 am: bb0ccc9b2b am: ↵James Farrell
991954d1f3 am: d53e7f07fd am: 2e44821063 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2721686 Change-Id: I17d3e162b0dfe14380ee3da11769e1bc90826495 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Changes for building Python 3.11 am: f82c4a3bf6 am: 865804ffed am: fa997dac2dJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2701697 Change-Id: I926f70c0fce91c01542f24382f02c590381d47ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge tag 'upstream-v3.11.4' into python-3.11-v3 am: bb0ccc9b2b am: ↵James Farrell
991954d1f3 am: d53e7f07fd Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2721686 Change-Id: I9604e468d35133c258ae090bfedc672083136b3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Changes for building Python 3.11 am: f82c4a3bf6 am: 865804ffedJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2701697 Change-Id: I338d2fee6ff44b5a6f463fa4b216e583e090e8f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge tag 'upstream-v3.11.4' into python-3.11-v3 am: bb0ccc9b2b am: 991954d1f3James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2721686 Change-Id: I7e277b9a02fb38db3d8b3f3a93f6b59da60fd1e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Changes for building Python 3.11 am: f82c4a3bf6James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2701697 Change-Id: Iebfca2469488126996fd71ded4ef7120e6aa50a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge tag 'upstream-v3.11.4' into python-3.11-v3 am: bb0ccc9b2bJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2721686 Change-Id: I143e732bf392e28e40c90239bfc7523e8eb59dd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Changes for building Python 3.11James Farrell
Update regen.sh Actually build Python and copy the frozen modules into android/Python Use regen.sh to update *.bp files, etc. Bug: 278602456 Change-Id: Ie3d972edf6246ad9246c846685ef18a548d49077 Test: prebuilts/build-tools/build-prebuilts.sh and also build py3-cmd on build-tools for Mac
2023-08-22Merge "Script to update to a new major version." into main am: 2ffe8e2d04 ↵James Farrell
am: dd62a25ff8 am: b45e6f1d15 am: c0ef20a84e am: 88bf141563 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2716433 Change-Id: Ia0844a1cd7b1e712beeb9a7b6c975ff88000f8b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Merge "Script to update to a new major version." into main am: 2ffe8e2d04 ↵James Farrell
am: dd62a25ff8 am: b45e6f1d15 am: c0ef20a84e Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2716433 Change-Id: I959922f832ff7f8ec537e76830e392b8522fbc47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Merge "Script to update to a new major version." into main am: 2ffe8e2d04 ↵James Farrell
am: dd62a25ff8 am: b45e6f1d15 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2716433 Change-Id: I01b0cb222fd9fd96e8d033266bb5382a119745c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Merge tag 'upstream-v3.11.4' into python-3.11-v3James Farrell
Python 3.11.4 Change-Id: I4856392acff4bf4b05028ee5680c17decb898977
2023-08-22Merge "Script to update to a new major version." into main am: 2ffe8e2d04 ↵James Farrell
am: dd62a25ff8 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2716433 Change-Id: I8b057e24a19e2896e819ec23e6f181b1a796940f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Merge "Script to update to a new major version." into main am: 2ffe8e2d04James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2716433 Change-Id: Iebbf922986f242e067620108cb6f5cab66cc0e3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22Merge "Script to update to a new major version." into mainJames Farrell
2023-08-17Simplify the launcher path detection (prep for 3.11) am: 02afc01277 am: ↵Dan Willemsen
b1fb7da08c am: 55f43e4231 am: 698b6765f8 am: da63aaa9ab Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2713453 Change-Id: Ic4dd12c3784d65e7c5f9c4d2e13138fd90dba3d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Script to update to a new major version.James Farrell
Bug: 278602456 Change-Id: I17d4249bddddbf4340c710e158dd852e641111fc
2023-08-17Simplify the launcher path detection (prep for 3.11) am: 02afc01277 am: ↵Dan Willemsen
b1fb7da08c am: 55f43e4231 am: 698b6765f8 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2713453 Change-Id: I9a6fbf9ccbd2d6a163b1a757b2e0521062e9d04e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Simplify the launcher path detection (prep for 3.11) am: 02afc01277 am: ↵Dan Willemsen
b1fb7da08c am: 55f43e4231 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2713453 Change-Id: Ibce38881a6612f43ec421e543b0374468c54f7de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Simplify the launcher path detection (prep for 3.11) am: 02afc01277 am: ↵Dan Willemsen
b1fb7da08c Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2713453 Change-Id: I8389e98e04d6b07cd31e17879f9cbfe1c3ddab44 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-27 11:33:59 +0000