devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

android: make installToolchains.sh work again

Browse source 
Google changed their site and the layout of downloaded SDK zips.
Also add a warning to configure if a r2x series NDK version is used, because those aren't supported - they no longer contain GCC, only clang.

Change-Id: I48a42c38c9b657ac6662162a39763aac73ec502a
This commit is contained in:
Nick Feldmann 2024-12-31 14:57:57 +01:00 • committed by Solomon Peachy
parent e79996e031
commit f1b53d129f
4 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/configure vendored
View file

@ -794,11 +794,16 @@ androidcc () {
exit
fi
if [ -z "$ANDROID_NDK_PATH" ]; then
echo "ERROR: You need the Android NDK installed (r10e or higher) and have the ANDROID_NDK_PATH"
echo "ERROR: You need the Android NDK installed (r10e to r17) and have the ANDROID_NDK_PATH"
echo "environment variable point to the root directory of the Android NDK."
exit
fi
make_toolchain="${ANDROID_NDK_PATH}/build/tools/make-standalone-toolchain.sh"
if [ ! -f "$make_toolchain" ]; then
echo "ERROR: You need the Android NDK installed (r10e to r17). Please note that"
echo "versions newer than r17 are not supported because they do not contain GCC."
exit
fi
# the prebuilt android NDK only supports x86_64 architecture anyway, so we can take shortcuts
buildhost=$(uname | tr "[:upper:]" "[:lower:]")-x86_64
@ -815,6 +820,7 @@ androidcc () {
ANDROID_PLATFORM_VERSION=$1
GCCOPTS="$GCCOPTS $3"
gccchoice="4.9"
rm -rf "${pwd}/android-toolchain" # old toolchain must be removed before running script
# arch dependant stuff
case $ANDROID_ARCH in
armeabi)