From 9fd7e333df00c257edf544475554b31da925bf9e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 9 Oct 2019 04:24:21 +0300 Subject: [PATCH] travis: another blind try to fix r10e unpack --- scripts/travis_android_deps.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/travis_android_deps.sh b/scripts/travis_android_deps.sh index 30068640..4fbf00a1 100755 --- a/scripts/travis_android_deps.sh +++ b/scripts/travis_android_deps.sh @@ -18,12 +18,13 @@ yes | sdk/tools/bin/sdkmanager --licenses > /dev/null 2>/dev/null # who even rea NDK_BUNDLE="ndk-bundle" if [ "$1" = "r10e" ]; then NDK_BUNDLE="" - wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin >/dev/null 2>/dev/null - 7z x ./android-ndk-r10e-linux-x86_64.bin - mv android-ndk-r10e ndk-bundle fi sdk/tools/bin/sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-19 $NDK_BUNDLE > /dev/null 2>/dev/null - +if [ "$1" = "r10e" ]; then + wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin >/dev/null 2>/dev/null + 7z x ./android-ndk-r10e-linux-x86_64.bin > /dev/null + mv android-ndk-r10e sdk/ndk-bundle +fi echo "Download Xash3D FWGS Android source" git clone --depth 1 https://github.com/FWGS/xash3d-android-project -b waf android || exit 1 cd android