Update and refactor GLES worker gradle scripts to build with recent Android SDK (#118)

Author: hevrard

.travis.yml

@@ -26,14 +26,16 @@ matrix:
       dist: trusty
       sudo: required
       env:
+        - TITLE="GraphicsFuzz and GLES workers"
         - INSTALL_SCRIPT="build/travis/1-install-deps-travis.sh"
         - BUILD_SCRIPT="python3.6 build/travis/build.py"
         - RELEASE_SCRIPT="python3.6 build/travis/release.py"
     - os: linux
       dist: trusty
       sudo: required
       env:
-        - INSTALL_SCRIPT="build/ci_vulkan_worker/1-install-deps-travis.sh"
+        - TITLE="Vulkan worker"
+        - INSTALL_SCRIPT="build/travis/1-install-deps-travis.sh"
         - BUILD_SCRIPT="build/ci_vulkan_worker/2-build-travis.sh"
         - RELEASE_SCRIPT="python3.6 build/travis/release.py"
         - ANDROID_NDK_HOME=/opt/android-sdk/ndk-bundle

build/ci_vulkan_worker/1-install-deps-travis.sh

@@ -28,6 +28,7 @@ if [ "$(uname)" == "Darwin" ];
 then
   brew install python3 unzip wget
   GITHUB_RELEASE_TOOL_ARCH="darwin_amd64"
+  ANDROID_HOST_PLATFORM="darwin"
 fi
 
 if [ "$(uname)" == "Linux" ];
@@ -36,6 +37,7 @@ then
   sudo apt-get update -q
   sudo apt-get install python3.6 unzip wget -y
   GITHUB_RELEASE_TOOL_ARCH="linux_amd64"
+  ANDROID_HOST_PLATFORM="linux"
 fi
 
 
@@ -44,17 +46,35 @@ wget "https://github.com/${GITHUB_RELEASE_TOOL_USER}/github-release/releases/dow
 tar xf "github-release_${GITHUB_RELEASE_TOOL_VERSION}_${GITHUB_RELEASE_TOOL_ARCH}.tar.gz"
 popd
 
-# Android SDK
 
-export ANDROID_TOOLS_FILENAME="tools_r25.2.3-linux.zip"
-export ANDROID_API_LEVELS="platforms;android-23"
-export ANDROID_BUILD_TOOLS_VERSION="25.0.0"
-export ANDROID_TOOLS_URL="http://dl.google.com/android/repository/${ANDROID_TOOLS_FILENAME}"
+# Android SDK (host platform is linux, darwin, or windows).
+
+ANDROID_TOOLS_FILENAME="sdk-tools-${ANDROID_HOST_PLATFORM}-4333796.zip"
+ANDROID_NDK_FILENAME="android-ndk-r18b-${ANDROID_HOST_PLATFORM}-x86_64.zip"
+ANDROID_PLATFORM_TOOLS_FILENAME="platform-tools_r28.0.1-${ANDROID_HOST_PLATFORM}.zip"
 
 mkdir -p "${ANDROID_HOME}"
 pushd "${ANDROID_HOME}"
-wget -q "${ANDROID_TOOLS_URL}"
-unzip "${ANDROID_TOOLS_FILENAME}"
+
+# Android: "sdk-tools.zip" "tools":
+wget -q "http://dl.google.com/android/repository/${ANDROID_TOOLS_FILENAME}"
+unzip -q "${ANDROID_TOOLS_FILENAME}"
 rm "${ANDROID_TOOLS_FILENAME}"
-echo y | sdkmanager "extras;android;m2repository" "tools" "platform-tools" "${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
+
+# Android "android-ndk.zip" "ndk-bundle"
+wget -q "https://dl.google.com/android/repository/${ANDROID_NDK_FILENAME}"
+unzip -q "${ANDROID_NDK_FILENAME}"
+rm "${ANDROID_NDK_FILENAME}"
+mv android-ndk-*/ ndk-bundle
+
+# Android "platform-tools.zip" "platform-tools"
+wget -q "https://dl.google.com/android/repository/${ANDROID_PLATFORM_TOOLS_FILENAME}"
+unzip -q "${ANDROID_PLATFORM_TOOLS_FILENAME}"
+rm "${ANDROID_PLATFORM_TOOLS_FILENAME}"
+
+# Android "platforms" and "build-tools"
+echo y | sdkmanager \
+  "platforms;android-26" \
+  "build-tools;28.0.2"
+
 popd

build/travis/1-install-deps-travis.sh

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 import os
+import sys
 import subprocess
 import shutil
 import licenses
@@ -46,6 +47,8 @@ def check_call_filter(cmd):
             continue
         print(line, end="")
     return_code = proc.wait()
+    print("")
+    sys.stdout.flush()
     assert return_code == 0
 
 
@@ -95,7 +98,7 @@ def go():
     os.chdir(path("platforms", "libgdx", "OGLTesting"))
 
     # Build desktop worker.
-    subprocess.call(
+    subprocess.check_call(
         ["./gradlew", "desktop:dist"])
 
     # Copy desktop worker.
@@ -105,12 +108,12 @@ def go():
     )
 
     # Build Android worker
-    subprocess.call(
+    subprocess.check_call(
         ["./gradlew", "android:assembleDebug"])
 
     # Copy Android worker.
     shutil.copy2(
-        path("android", "build", "outputs", "apk", "android-debug.apk"),
+        path("android", "build", "outputs", "apk", "debug", "android-debug.apk"),
         path(source_root, "out", "android-gles-worker.apk")
     )
 

build/travis/build.py

@@ -1,6 +1,50 @@
+
+buildscript {
+    repositories {
+          mavenLocal()
+          mavenCentral()
+          maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+          jcenter()
+          google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.0'
+    }
+}
+
+apply plugin: "com.android.application"
+
+configurations { natives }
+
+dependencies {
+    implementation project(":core")
+    implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
+    implementation "com.android.support:appcompat-v7:23.4.0"
+    implementation files("../../../../android-client-dep/target/android-client-dep-1.0.jar")
+}
+
 android {
-    buildToolsVersion "25"
-    compileSdkVersion 23
+    compileSdkVersion 26
+
+    defaultConfig {
+        applicationId "com.graphicsfuzz.libgdxclient"
+        minSdkVersion 24
+        targetSdkVersion 26
+        versionCode  1
+        versionName '0.0.1'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                    'proguard-rules.pro'
+        }
+    }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -13,22 +57,13 @@ android {
         }
 
     }
-    defaultConfig {
-        applicationId "com.graphicsfuzz.libgdxclient"
-        minSdkVersion 18
-        targetSdkVersion 23
-    }
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
 }
 
 
 // called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
-task copyAndroidNatives() { 
+task copyAndroidNatives() {
     file("libs/armeabi/").mkdirs();
     file("libs/armeabi-v7a/").mkdirs();
     file("libs/arm64-v8a/").mkdirs();
@@ -38,7 +73,7 @@ task copyAndroidNatives() {
     configurations.natives.files.each { jar ->
         def outputDir = null
         if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
-        if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")        
+        if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
         if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
         if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
         if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
@@ -52,78 +87,3 @@ task copyAndroidNatives() {
     }
 }
 
-task run(type: Exec) {
-    def path
-    def localProperties = project.file("../local.properties")
-    if (localProperties.exists()) {
-        Properties properties = new Properties()
-        localProperties.withInputStream { instr ->
-            properties.load(instr)
-        }
-        def sdkDir = properties.getProperty('sdk.dir')
-        if (sdkDir) {
-            path = sdkDir
-        } else {
-            path = "$System.env.ANDROID_HOME"
-        }
-    } else {
-        path = "$System.env.ANDROID_HOME"
-    }
-
-    def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.graphicsfuzz.libgdxclient/com.graphicsfuzz.libgdxclient.AndroidLauncher'
-}
-
-// sets up the Android Eclipse project, using the old Ant based build.
-eclipse {
-    // need to specify Java source sets explicitly, SpringSource Gradle Eclipse plugin
-    // ignores any nodes added in classpath.file.withXml
-    sourceSets {
-        main {
-            java.srcDirs "src", 'gen'
-        }
-    }
-
-    jdt {
-        sourceCompatibility = 1.6
-        targetCompatibility = 1.6
-    }
-
-    classpath {
-        plusConfigurations += [ project.configurations.compile ]        
-        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'       
-    }
-
-    project {
-        name = appName + "-android"
-        natures 'com.android.ide.eclipse.adt.AndroidNature'
-        buildCommands.clear();
-        buildCommand "com.android.ide.eclipse.adt.ResourceManagerBuilder"
-        buildCommand "com.android.ide.eclipse.adt.PreCompilerBuilder"
-        buildCommand "org.eclipse.jdt.core.javabuilder"
-        buildCommand "com.android.ide.eclipse.adt.ApkBuilder"
-    }
-}
-
-// sets up the Android Idea project, using the old Ant based build.
-idea {
-    module {
-        sourceDirs += file("src");
-        scopes = [ COMPILE: [plus:[project.configurations.compile]]]        
-
-        iml {
-            withXml {
-                def node = it.asNode()
-                def builder = NodeBuilder.newInstance();
-                builder.current = node;
-                builder.component(name: "FacetManager") {
-                    facet(type: "android", name: "Android") {
-                        configuration {
-                            option(name: "UPDATE_PROPERTY_FILES", value:"true")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}