diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-26 14:48:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 14:48:02 +0200 |
| commit | ef9d3c0d8811b43b234499e2a6081a7923b42cb8 (patch) | |
| tree | 14747103b456cf4895cd6692192121672240d8bb | |
| parent | a8e007f055c69483c77945739f2c3218de5e5c44 (diff) | |
| parent | ab4b57de1f9ecab3497bb0bbb6905333b59b6e77 (diff) | |
Merge pull request #33082 from akien-mga/travis-android-force-openjdk8
Travis: Force installing OpenJDK8 for Android SDK compatibility
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | misc/travis/android-tools-linux.sh | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 49d1059360..8a6f80002b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,10 @@ matrix: env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes" os: linux compiler: clang + addons: + apt: + packages: + - openjdk-8-jdk - name: macOS editor (debug, Clang) stage: build @@ -116,14 +120,14 @@ before_install: install: - pip install --user scons; - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$PLATFORM" = "android" ]; then + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64; + export PATH=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:${PATH}; + java -version; misc/travis/android-tools-linux.sh; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=${PATH}:/Users/travis/Library/Python/2.7/bin; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$PLATFORM" = "android" ]; then - misc/travis/android-tools-osx.sh; - fi before_script: - if [ "$PLATFORM" = "android" ]; then 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 |