mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.13] gh-129156: Fix variable quoting in android-env.sh script (GH-129321) (#129332)

Browse source 
Adds quoting to `android-env.sh` to protect against spaces in paths.
(cherry picked from commit a49225cc66)

Co-authored-by: Zanie Blue <contact@zanie.dev>
This commit is contained in:
Russell Keith-Magee 2025-01-27 15:07:40 +08:00 • committed by GitHub
parent 6e887411b6
commit 98c25b8e13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Android/android-env.sh
View file

@ -1,10 +1,10 @@
# This script must be sourced with the following variables already set: # This script must be sourced with the following variables already set:
: ${ANDROID_HOME:?} # Path to Android SDK : "${ANDROID_HOME:?}" # Path to Android SDK
: ${HOST:?} # GNU target triplet : "${HOST:?}" # GNU target triplet
# You may also override the following: # You may also override the following:
: ${api_level:=21} # Minimum Android API level the build will run on : "${api_level:=21}" # Minimum Android API level the build will run on
: ${PREFIX:-} # Path in which to find required libraries : "${PREFIX:-}" # Path in which to find required libraries
# Print all messages on stderr so they're visible when running within build-wheel. # Print all messages on stderr so they're visible when running within build-wheel.
@ -27,20 +27,20 @@ fail() {
ndk_version=27.1.12297006 ndk_version=27.1.12297006
ndk=$ANDROID_HOME/ndk/$ndk_version ndk=$ANDROID_HOME/ndk/$ndk_version
if ! [ -e $ndk ]; then if ! [ -e "$ndk" ]; then
log "Installing NDK - this may take several minutes" log "Installing NDK - this may take several minutes"
yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;$ndk_version" yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "ndk;$ndk_version"
fi fi
if [ $HOST = "arm-linux-androideabi" ]; then if [ "$HOST" = "arm-linux-androideabi" ]; then
clang_triplet=armv7a-linux-androideabi clang_triplet=armv7a-linux-androideabi
else else
clang_triplet=$HOST clang_triplet="$HOST"
fi fi
# These variables are based on BuildSystemMaintainers.md above, and # These variables are based on BuildSystemMaintainers.md above, and
# $ndk/build/cmake/android.toolchain.cmake. # $ndk/build/cmake/android.toolchain.cmake.
toolchain=$(echo $ndk/toolchains/llvm/prebuilt/*) toolchain=$(echo "$ndk"/toolchains/llvm/prebuilt/*)
export AR="$toolchain/bin/llvm-ar" export AR="$toolchain/bin/llvm-ar"
export AS="$toolchain/bin/llvm-as" export AS="$toolchain/bin/llvm-as"
export CC="$toolchain/bin/${clang_triplet}${api_level}-clang" export CC="$toolchain/bin/${clang_triplet}${api_level}-clang"
@ -72,12 +72,12 @@ LDFLAGS="$LDFLAGS -lm"
# -mstackrealign is included where necessary in the clang launcher scripts which are # -mstackrealign is included where necessary in the clang launcher scripts which are
# pointed to by $CC, so we don't need to include it here. # pointed to by $CC, so we don't need to include it here.
if [ $HOST = "arm-linux-androideabi" ]; then if [ "$HOST" = "arm-linux-androideabi" ]; then
CFLAGS="$CFLAGS -march=armv7-a -mthumb" CFLAGS="$CFLAGS -march=armv7-a -mthumb"
fi fi
if [ -n "${PREFIX:-}" ]; then if [ -n "${PREFIX:-}" ]; then
abs_prefix=$(realpath $PREFIX) abs_prefix="$(realpath "$PREFIX")"
CFLAGS="$CFLAGS -I$abs_prefix/include" CFLAGS="$CFLAGS -I$abs_prefix/include"
LDFLAGS="$LDFLAGS -L$abs_prefix/lib" LDFLAGS="$LDFLAGS -L$abs_prefix/lib"
@ -87,11 +87,13 @@ fi
# When compiling C++, some build systems will combine CFLAGS and CXXFLAGS, and some will # When compiling C++, some build systems will combine CFLAGS and CXXFLAGS, and some will
# use CXXFLAGS alone. # use CXXFLAGS alone.
export CXXFLAGS=$CFLAGS export CXXFLAGS="$CFLAGS"
# Use the same variable name as conda-build # Use the same variable name as conda-build
if [ $(uname) = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then
export CPU_COUNT=$(sysctl -n hw.ncpu) CPU_COUNT="$(sysctl -n hw.ncpu)"
export CPU_COUNT
else else
export CPU_COUNT=$(nproc) CPU_COUNT="$(nproc)"
export CPU_COUNT
fi fi