aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Snap for 11400057 from 712add474260c72a9382c6b4a0a150becaf82e8f to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: Ia91eb3340bfb9164035cf0b11be54118e17278f9
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-10-16Snap for 10957012 from 991af89d2c4ed970624ac3e250579c8e89710932 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ic0ccea499eb414b12213ba64f01ccc80ce2540d3
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-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-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 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 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-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>
2023-08-17Simplify the launcher path detection (prep for 3.11) am: 02afc01277Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2713453 Change-Id: I8c81c0848dd30eb8192e569992aaca0ba0505c47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Simplify the launcher path detection (prep for 3.11)Dan Willemsen
As of 3.10, we've had the ability to modify the `lib` name in the default lookup path, so change that to `internal` to match our existing layout. Then move the stdlib to the versioned directory `internal/python3.10` via pkg_path. This removes the need for us to add custom entries to the path and entirely use the default set. Remove the src or prebuilt stdlib logic from Lib/Android.bp, it's being moved into soong so that we can have different `pkg_path` settings between the two. Bug: 278602456 Test: treehugger Test: build/soong/python/tests/runtest.sh Change-Id: Ice483a8102d02bfbfbca2c66c7a1371b300dd4de
2023-07-20Snap for 10448490 from 7725ed4b1c3951951cd9b0022d2a3b8599ff8f49 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ia36581da967904f700b506c902c8dbd0dea0926f
2023-06-12Snap for 10306048 from 5c60119f0d17194bf240a72c9f35975449ddb942 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I774d0ec8377d5d47f694c8cf4dbcc1182b536815
2023-06-09Prefer the MSBuild in C:\VS over the one in Program Files. am: 5c60119f0d ↵Ryan Prichard
am: 7725ed4b1c am: b59220f313 am: 3a076e0b12 am: 1e3985b7b9 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2619245 Change-Id: I8668fb8517b6ba464740cfddfa58689f9084adf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Prefer the MSBuild in C:\VS over the one in Program Files. am: 5c60119f0d ↵Ryan Prichard
am: 7725ed4b1c am: b59220f313 am: 3a076e0b12 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2619245 Change-Id: I51889d3b01fc264c4884292002b8f709802a18f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Prefer the MSBuild in C:\VS over the one in Program Files. am: 5c60119f0d ↵Ryan Prichard
am: 7725ed4b1c am: b59220f313 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2619245 Change-Id: I0991ab9a7cb421e54b9c1c58f8e9f0b8323bc25b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Prefer the MSBuild in C:\VS over the one in Program Files. am: 5c60119f0d ↵Ryan Prichard
am: 7725ed4b1c Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2619245 Change-Id: I971a22a14141cd158ab4d881d59401a61f66ba3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Prefer the MSBuild in C:\VS over the one in Program Files. am: 5c60119f0dRyan Prichard
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2619245 Change-Id: I6a30a08ffdfd40698366ae2ea780ea1a74365af8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Prefer the MSBuild in C:\VS over the one in Program Files.Ryan Prichard
Bug: https://yaqs.corp.google.com/eng/q/8657098259782696960 Test: kokoro builds Change-Id: Ia129c94a654b12d4b1da5ea5caea61a35d667296
2023-06-07Define SOABI for riscv64 in cpython am: a6c28c4c0b am: 858b60492c am: ↵Prashanth Swaminathan
c73636dcc1 am: e2517e31f1 am: a257b396d9 Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2617597 Change-Id: I69c217095906c8ed10f11c48d46a4834102b06f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>