diff --git a/scripts/travis_android_deps.sh b/scripts/travis_android_deps.sh index d5d57b88..e8a0c001 100755 --- a/scripts/travis_android_deps.sh +++ b/scripts/travis_android_deps.sh @@ -5,12 +5,9 @@ echo "Download HLSDK" cd $TRAVIS_BUILD_DIR git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-xash3d hlsdk || exit 1 -echo "Download Android SDK" +echo "Download and unpack Android SDK" mkdir -p sdk && cd sdk -wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -qO sdk.zip > /dev/null 2>/dev/null || exit 1 - -echo "Unpack Android SDK" -unzip sdk.zip > /dev/null 2>/dev/null || exit 1 +(wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -qO - > /dev/null 2>/dev/null | busybox unzip -x -) || exit 1 cd $TRAVIS_BUILD_DIR echo "Download all needed tools and NDK" @@ -21,8 +18,7 @@ if [ "$1" = "r10e" ]; then fi sdk/tools/bin/sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-26 $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 + (wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip /dev/null 2>/dev/null | busybox unzip -x -) || exit 1 mv android-ndk-r10e sdk/ndk-bundle fi echo "Download Xash3D FWGS Android source"