diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-26 14:28:07 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-26 14:28:07 +0200 |
commit | ab4b57de1f9ecab3497bb0bbb6905333b59b6e77 (patch) | |
tree | 14747103b456cf4895cd6692192121672240d8bb /misc | |
parent | a8e007f055c69483c77945739f2c3218de5e5c44 (diff) | |
download | redot-engine-ab4b57de1f9ecab3497bb0bbb6905333b59b6e77.tar.gz |
Travis: Force installing OpenJDK8 for Android SDK compatibility
Travis CI upgraded their Xenial VMs to default to openjdk11, which
is not working properly for sdkmanager, so we can no longer accept
licenses for the SDK.
They don't really seem to care about providing a good alternative
for us from the few threads I read, so let's just force openjdk8
back.
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/travis/android-tools-linux.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/travis/android-tools-linux.sh b/misc/travis/android-tools-linux.sh index 215b9fd159..d0c123ee6c 100755 --- a/misc/travis/android-tools-linux.sh +++ b/misc/travis/android-tools-linux.sh @@ -70,9 +70,10 @@ if [ ! -d $ANDROID_NDK_DIR ]; then echo fi -echo "Installing: Android Tools ..." mkdir -p ~/.android && echo "count=0" > ~/.android/repositories.cfg +echo "Installing: Accepting Licenses ..." yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager --licenses > /dev/null +echo "Installing: Android Build and Platform Tools ..." yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager 'tools' > /dev/null yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager 'platform-tools' > /dev/null yes | $ANDROID_SDK_DIR/tools/bin/sdkmanager 'build-tools;28.0.3' > /dev/null |