Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

gh-131531: android.py enhancements to support cibuildwheel#132870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
freakboy3742 merged 18 commits intopython:mainfrommhsmith:cibuildwheel
Jun 5, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
18 commits
Select commitHold shift + click to select a range
71cccb3
Add `android.py env` command
mhsmithApr 24, 2025
e3d27ac
Miscellaneous cleanups
mhsmithApr 24, 2025
6156255
Merge branch 'main' into cibuildwheel
mhsmithApr 24, 2025
24b082f
Prefer 'encoding' to 'text'
mhsmithApr 24, 2025
b7461d3
Clarify sysconfigdata file discovery
mhsmithApr 24, 2025
c7cdb98
Rename api_level environment variable to ANDROID_API_LEVEL
mhsmithApr 25, 2025
f29e177
Environment variable cleanups
mhsmithApr 30, 2025
fc8c1e1
Add `android.py test` -c and -m options
mhsmithMay 2, 2025
b273bc7
Add `android.py test` --site-packages and --cwd options
mhsmithMay 3, 2025
9c46ab0
Merge remote-tracking branch 'origin/main' into cibuildwheel
mhsmithMay 6, 2025
5d75b7b
Merge branch 'main' into cibuildwheel
mhsmithMay 29, 2025
f36273a
Revert use of NODIST environment variables
mhsmithMay 29, 2025
36da007
Merge remote-tracking branch 'origin/main' into cibuildwheel
mhsmithMay 29, 2025
51e1460
Update to current Android Gradle plugin version, which gives better e…
mhsmithJun 2, 2025
497e84c
Update to an NDK version which is pre-installed on GitHub Actions
mhsmithJun 3, 2025
ddfb875
Logging improvements
mhsmithJun 3, 2025
e4192b4
Merge branch 'main' into cibuildwheel
freakboy3742Jun 4, 2025
6f18528
Update to bzip2-1.0.8-3
mhsmithJun 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletionsAndroid/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,6 +156,10 @@ repository's `Lib` directory will be picked up immediately. Changes in C files,
and architecture-specific files such as sysconfigdata, will not take effect
until you re-run `android.py make-host` or `build`.

The testbed app can also be used to test third-party packages. For more details,
run `android.py test --help`, paying attention to the options `--site-packages`,
`--cwd`, `-c` and `-m`.


## Using in your own app

Expand Down
6 changes: 3 additions & 3 deletionsAndroid/android-env.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
: "${HOST:?}" # GNU target triplet

# You may also override the following:
: "${api_level:=24}" # Minimum Android API level the build will run on
: "${ANDROID_API_LEVEL:=24}" # Minimum Android API level the build will run on
Copy link
MemberAuthor

@mhsmithmhsmithJun 4, 2025
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I'm not sure whether there will be a merge conflict on this line when backporting to 3.13, but either way, the API level on that branch should remain at 21. Apart from that, this file should be identical on all branches.

: "${PREFIX:-}" # Path in which to find required libraries


Expand All@@ -24,7 +24,7 @@ fail() {
# * https://android.googlesource.com/platform/ndk/+/ndk-rXX-release/docs/BuildSystemMaintainers.md
# where XX is the NDK version. Do a diff against the version you're upgrading from, e.g.:
# https://android.googlesource.com/platform/ndk/+/ndk-r25-release..ndk-r26-release/docs/BuildSystemMaintainers.md
ndk_version=27.1.12297006
ndk_version=27.2.12479018

ndk=$ANDROID_HOME/ndk/$ndk_version
if ! [ -e "$ndk" ]; then
Expand All@@ -43,7 +43,7 @@ fi
toolchain=$(echo "$ndk"/toolchains/llvm/prebuilt/*)
export AR="$toolchain/bin/llvm-ar"
export AS="$toolchain/bin/llvm-as"
export CC="$toolchain/bin/${clang_triplet}${api_level}-clang"
export CC="$toolchain/bin/${clang_triplet}${ANDROID_API_LEVEL}-clang"
export CXX="${CC}++"
export LD="$toolchain/bin/ld"
export NM="$toolchain/bin/llvm-nm"
Expand Down
Loading
Loading

[8]ページ先頭

©2009-2025 Movatter.jp