From dc8b8ccab34b8aa616f73f99d6c3fdbe1432b6f5 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 29 Jul 2019 08:27:11 +0300 Subject: [PATCH] travis: android: accept all licenses --- .travis.yml | 3 ++- scripts/travis_android_deps.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93583892..6bc2dbda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,9 +74,10 @@ jobs: language: java # we want xenial, so just java, not android jdk: openjdk8 before_script: + - export ANDROID_HOME=$TRAVIS_BUILD_DIR/sdk - sh scripts/travis_common_deps.sh - sh scripts/travis_android_deps.sh - - export ANDROID_SDK_HOME=$TRAVIS_BUILD_DIR/sdk + - export ANDROID_SDK_HOME=$ANDROID_HOME - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk-bundle script: - cd android diff --git a/scripts/travis_android_deps.sh b/scripts/travis_android_deps.sh index 8f9c0777..f01e1e08 100755 --- a/scripts/travis_android_deps.sh +++ b/scripts/travis_android_deps.sh @@ -14,6 +14,7 @@ unzip sdk.zip > /dev/null 2>/dev/null || exit 1 cd $TRAVIS_BUILD_DIR echo "Download all needed tools and NDK" +yes | sdk/tools/bin/sdkmanager --licenses sdk/tools/bin/sdkmanager --install build-tools\;29.0.1 platform-tools platforms\;android-19 ndk-bundle echo "Download Xash3D FWGS Android source"