Enabled android-ndk to work with Python 3.12+ #809
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
veloman-yunkan
force-pushed
the
python3.13+_friendly_android-ndk-r21e
branch
from
2c96505 to
e81d9c4
Compare
veloman-yunkan
changed the title
kelson42
requested changes
Mar 8, 2025
distutils was dropped from Python 3.12. Fortunately, our usage of android-ndk only relied on distutils.dir_util.copy_tree() in build/tools/make_standalone_toolchain.py which is easy to replace with shutil.copytree(). That is done via a small patch. Note that there are more references to distutils in the following files but it looks like our CI/CD flows aren't affected by those: sources/third_party/shaderc/third_party/spirv-tools/utils/generate_registry_tables.py sources/third_party/vulkan/src/scripts/update_deps.py prebuilt/linux-x86_64/bin/python2.7-config prebuilt/linux-x86_64/bin/python-config prebuilt/linux-x86_64/bin/python2-config various files under prebuilt/linux-x86_64/lib/python2.7/ python-packages/fastboot/setup.py python-packages/adb/setup.py
kelson42
force-pushed
the
python3.13+_friendly_android-ndk-r21e
branch
from
e81d9c4 to
5684372
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should fix #808
distutilswas dropped from Python 3.12. Fortunately, our usage ofandroid-ndkonly relied ondistutils.dir_util.copy_tree()inbuild/tools/make_standalone_toolchain.pywhichis easy to replace with
shutil.copytree(). That is done via a small patch.Note that there are more references to
distutilsin the following files but it looks like our CI/CD flows aren't affected by those:sources/third_party/shaderc/third_party/spirv-tools/utils/generate_registry_tables.pysources/third_party/vulkan/src/scripts/update_deps.pyprebuilt/linux-x86_64/bin/python2.7-configprebuilt/linux-x86_64/bin/python-configprebuilt/linux-x86_64/bin/python2-configprebuilt/linux-x86_64/lib/python2.7/python-packages/fastboot/setup.pypython-packages/adb/setup.py