Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Travis, trying a newer version of android ndk"

Browse Source 
This reverts commit 93492ae091.
This commit is contained in:
Eduardo MG
2024-08-19 19:03:40 -06:00
parent 93492ae091
commit 30505b0e5d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -37,7 +37,7 @@ before_install:
if [ `uname -m` = x86_64 ]; then if [ `uname -m` = x86_64 ]; then
sudo dpkg --add-architecture i386 && sudo apt-get update && sudo dpkg --add-architecture i386 && sudo apt-get update &&
sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; fi && sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; fi &&
wget https://dl.google.com/android/repository/android-ndk-r27-linux.zip -nv && wget https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip -nv &&
wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -nv; wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -nv;
fi fi
@@ -46,7 +46,7 @@ install:
tar -x --xz -f sdk.lzma; tar -x --xz -f sdk.lzma;
fi fi
- if [ "$BUILD_ANDROID" == "YES" ]; then - if [ "$BUILD_ANDROID" == "YES" ]; then
unzip android-ndk-r27-linux.zip && unzip android-ndk-r22-linux-x86_64.zip &&
tar -zxf android-sdk_r24.4.1-linux.tgz && tar -zxf android-sdk_r24.4.1-linux.tgz &&
$ANDROID list sdk --extended -a && $ANDROID list sdk --extended -a &&
echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https; echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;

2
tools/travis-script.sh
View File

@@ -61,7 +61,7 @@ fi
# we're building an Android binary here # we're building an Android binary here
if [ "$BUILD_ANDROID" = "YES" ]; then if [ "$BUILD_ANDROID" = "YES" ]; then
android-ndk-r27/ndk-build -C projects/mtg/Android -j4 android-ndk-r23/ndk-build -C projects/mtg/Android -j4
$ANDROID list targets $ANDROID list targets
$ANDROID update project -t 1 -p projects/mtg/Android $ANDROID update project -t 1 -p projects/mtg/Android
ant debug -f projects/mtg/Android/build.xml ant debug -f projects/mtg/Android/build.xml