Merge pull request #37729 from akien-mga/travis-reenable-android

.travis.yml

@@ -55,17 +55,15 @@ matrix:
           packages:
             - *linux_deps
 
-# TODO: Android support
-
-#    - name: Android export template (release_debug, Clang)
-#      stage: build
-#      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: Android export template (release_debug, Clang)
+      stage: build
+      env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
+      os: linux
+      compiler: clang
+      addons:
+        apt:
+          packages:
+            - openjdk-8-jdk
 
     - name: macOS editor (debug, Clang)
       stage: build
@@ -92,21 +90,6 @@ matrix:
 #          packages:
 #            - scons
 
-# TODO: Dummy/Offscreen rasterizer
-
-#    - name: Linux headless editor (release_debug, GCC 9, testing project exporting and script running)
-#      stage: build
-#      env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="warnings=extra werror=yes" TEST_PROJECT=yes
-#      os: linux
-#      compiler: gcc-9
-#      addons:
-#        apt:
-#          sources:
-#            - sourceline: "ppa:ubuntu-toolchain-r/test"
-#          packages:
-#            - *gcc9_deps
-#            - *linux_deps
-
     - name: Linux export template (release_debug, GCC 7, without 3D support)
       stage: build
       env: PLATFORM=linuxbsd TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-7 EXTRA_ARGS="disable_3d=yes"

misc/travis/android-tools-linux.sh

@@ -24,12 +24,12 @@ ANDROID_SDK_URL=$ANDROID_BASE_URL/$ANDROID_SDK_FILENAME
 ANDROID_SDK_PATH=$GODOT_BUILD_TOOLS_PATH/$ANDROID_SDK_DIR
 ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
 
-ANDROID_NDK_RELEASE=r20
+ANDROID_NDK_RELEASE=r21
 ANDROID_NDK_DIR=android-ndk
 ANDROID_NDK_FILENAME=android-ndk-$ANDROID_NDK_RELEASE-linux-x86_64.zip
 ANDROID_NDK_URL=$ANDROID_BASE_URL/$ANDROID_NDK_FILENAME
 ANDROID_NDK_PATH=$GODOT_BUILD_TOOLS_PATH/$ANDROID_NDK_DIR
-ANDROID_NDK_SHA1=8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff
+ANDROID_NDK_SHA1=afc9c0b9faad222898ac8168c78ad4ccac8a1b5c
 
 echo
 echo "Download and install Android development tools ..."