[test] Run unit tests as NativeActivity application on Android

23 files changed, 528 insertions, 29 deletions

diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 920c472ffd..59b92f59fb 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -319,19 +319,53 @@ target_link_libraries(
         mbgl-compiler-options
 )
 
-add_executable(
-    mbgl-test-runner
-    ${MBGL_ROOT}/platform/android/src/test/runtime.cpp ${MBGL_ROOT}/platform/android/src/test/runtime.hpp
+add_library(
+    mbgl-test-runner SHARED
+    ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c
     ${MBGL_ROOT}/platform/android/src/test/test_runner.cpp
+    ${MBGL_ROOT}/platform/android/src/test/test_runner_common.cpp
+    ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
+    ${MBGL_ROOT}/platform/android/src/test/collator_test_stub.cpp
+    ${MBGL_ROOT}/platform/android/src/test/number_format_test_stub.cpp
+    ${MBGL_ROOT}/platform/default/src/mbgl/storage/file_source.cpp
+)
+
+target_include_directories(
+    mbgl-test-runner
+    PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue ${MBGL_ROOT}/platform/android/src ${MBGL_ROOT}/src
 )
 
 target_link_libraries(
     mbgl-test-runner
     PRIVATE
         Mapbox::Base::jni.hpp
-        mapbox-gl
         mbgl-compiler-options
+        -Wl,--whole-archive
         mbgl-test
+        -Wl,--no-whole-archive
+)
+
+add_custom_command(
+    TARGET mbgl-test-runner PRE_BUILD
+    COMMAND
+        ${CMAKE_COMMAND}
+        -E
+        make_directory
+        ${MBGL_ROOT}/test/results
+    COMMAND
+        ${CMAKE_COMMAND}
+        -E
+        tar
+        "chf"
+        "test/android/app/src/main/assets/data.zip"
+        --format=zip
+        --files-from=test/android/app/src/main/assets/to_zip.txt
+    COMMAND
+        ${CMAKE_COMMAND}
+        -E
+        remove_directory
+        ${MBGL_ROOT}/test/results
+    WORKING_DIRECTORY ${MBGL_ROOT}
 )
 
 add_library(
@@ -343,24 +377,17 @@ add_library(
     ${MBGL_ROOT}/platform/android/src/test/collator_test_stub.cpp
     ${MBGL_ROOT}/platform/android/src/test/number_format_test_stub.cpp
     ${MBGL_ROOT}/platform/default/src/mbgl/storage/file_source.cpp
-    ${MBGL_ROOT}/platform/default/src/mbgl/storage/default_file_source.cpp
 )
 
 target_include_directories(
     mbgl-benchmark-runner
-    PRIVATE
-        ${ANDROID_NDK}/sources/android/native_app_glue
-        ${MBGL_ROOT}/platform/android/src
-        ${MBGL_ROOT}/src
-        ${MBGL_ROOT}/platform/default/include
+    PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue ${MBGL_ROOT}/platform/android/src ${MBGL_ROOT}/src
 )
 
 target_link_libraries(
     mbgl-benchmark-runner
     PRIVATE
         Mapbox::Base::jni.hpp
-        android
-        log
         mbgl-compiler-options
         -Wl,--whole-archive
         mbgl-benchmark
diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake
index 98787eb04a..6c06a75e61 100644
--- a/next/platform/linux/linux.cmake
+++ b/next/platform/linux/linux.cmake
@@ -96,7 +96,11 @@ target_compile_definitions(
 
 target_link_libraries(
     mbgl-test-runner
-    PRIVATE mbgl-compiler-options mbgl-test
+    PRIVATE
+        mbgl-compiler-options
+        -Wl,--whole-archive
+        mbgl-test
+        -Wl,--no-whole-archive
 )
 
 add_executable(
diff --git a/next/test/CMakeLists.txt b/next/test/CMakeLists.txt
index 761064f5b2..06d8045d0a 100644
--- a/next/test/CMakeLists.txt
+++ b/next/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_library(
-    mbgl-test SHARED EXCLUDE_FROM_ALL
+    mbgl-test STATIC EXCLUDE_FROM_ALL
     ${MBGL_ROOT}/test/actor/actor.test.cpp
     ${MBGL_ROOT}/test/actor/actor_ref.test.cpp
     ${MBGL_ROOT}/test/algorithm/update_renderables.test.cpp
@@ -157,8 +157,7 @@ target_link_libraries(
         Mapbox::Base::Extras::args
         Mapbox::Base::pixelmatch-cpp
         mbgl-compiler-options
-        mbgl-core
-        $<$<PLATFORM_ID:Android>:mbgl-core-android>
+    PUBLIC mbgl-core
 )
 
 target_link_libraries(
diff --git a/platform/android/src/test/test_runner.cpp b/platform/android/src/test/test_runner.cpp
index 008e3c5748..ec315fe27c 100644
--- a/platform/android/src/test/test_runner.cpp
+++ b/platform/android/src/test/test_runner.cpp
@@ -1,10 +1,75 @@
-#include "runtime.hpp"
 #include <mbgl/test.hpp>
+#include "test_runner_common.hpp"
 
-int main(int argc, char *argv[]) {
-    if (!mbgl::android::initRuntime(argc, argv)) {
-        return 1;
+#include <unistd.h>
+#include <thread>
+
+using namespace mbgl;
+using namespace mbgl::android;
+
+std::atomic<bool> running{true};
+std::once_flag done;
+ALooper* looper = NULL;
+
+void runner() {
+    std::vector<std::string> arguments = {"mbgl-test-runner", "--gtest_output=xml:/sdcard/test/results/results.xml"};
+    std::vector<char*> argv;
+    for (const auto& arg : arguments) {
+        argv.push_back((char*)arg.data());
     }
+    argv.push_back(nullptr);
+
+    mbgl::Log::Info(mbgl::Event::General, "Start TestRunner");
+    int status = mbgl::runTests(argv.size(), argv.data());
+    mbgl::Log::Info(mbgl::Event::General, "TestRunner finished with status: '%d'", status);
+    running = false;
+    ALooper_wake(looper);
+}
+
+void android_main(struct android_app* app) {
+    mbgl::android::theJVM = app->activity->vm;
+    JNIEnv* env = nullptr;
+    std::thread runnerThread;
+    app->activity->vm->AttachCurrentThread(&env, NULL);
+    looper = ALooper_forThread();
+
+    std::string storagePath(app->activity->internalDataPath);
+    std::string zipFile = storagePath + "/data.zip";
 
-    mbgl::runTests(argc, argv);
+    if (copyFile(env, app->activity->assetManager, zipFile, storagePath, "data.zip")) {
+        if (chdir("/sdcard")) {
+            mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to /sdcard");
+            changeState(env, app, false);
+        } else {
+            unZipFile(env, zipFile, "/sdcard/");
+            runnerThread = std::thread(runner);
+        }
+    } else {
+        mbgl::Log::Error(mbgl::Event::General, "Failed to copy zip file '%s' to external storage", zipFile.c_str());
+        changeState(env, app, false);
+    }
+
+    int outFd, outEvents;
+    struct android_poll_source* source = nullptr;
+
+    while (true) {
+        ALooper_pollAll(-1, &outFd, &outEvents, reinterpret_cast<void**>(&source));
+        if (source != nullptr) {
+            source->process(app, source);
+        }
+
+        if (!running) {
+            std::call_once(done, [&] {
+                mbgl::Log::Info(mbgl::Event::General, "TestRunner done");
+                runnerThread.join();
+                changeState(env, app, true);
+            });
+        }
+
+        if (app->destroyRequested != 0) {
+            app->activity->vm->DetachCurrentThread();
+            mbgl::Log::Info(mbgl::Event::General, "Close the App!");
+            return;
+        }
+    }
 }
diff --git a/test/android/README.md b/test/android/README.md
new file mode 100644
index 0000000000..434051826c
--- /dev/null
+++ b/test/android/README.md
@@ -0,0 +1,3 @@
+# TestRunner
+
+This app is a purely native application that can run **mbgl-test-runner** on Android devices.
diff --git a/test/android/app/build.gradle b/test/android/app/build.gradle
new file mode 100644
index 0000000000..9f915bbbd0
--- /dev/null
+++ b/test/android/app/build.gradle
@@ -0,0 +1,52 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        applicationId = 'com.mapbox.mapboxsdk.maps.test_runner'
+        minSdkVersion 14
+        targetSdkVersion 28
+        def abi = 'all'
+        if (project.hasProperty('mapbox.abis')) {
+            abi = project.getProperty('mapbox.abis')
+        }
+        ndk {
+            if (abi != 'all') {
+                abiFilters abi.split(' ')
+            } else {
+                abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
+            }
+        }
+        externalNativeBuild {
+            cmake {
+                arguments '-DANDROID_CCACHE=ccache'
+                arguments '-DANDROID_STL=c++_static'
+                targets 'mbgl-test-runner'
+            }
+        }
+        android {
+            testBuildType 'release'
+        }
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+    externalNativeBuild {
+        cmake {
+            version '3.10.2'
+            path '../../../next/CMakeLists.txt'
+        }
+    }
+    buildTypes {
+        release {
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+}
diff --git a/test/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
new file mode 100644
index 0000000000..2affd51292
--- /dev/null
+++ b/test/android/app/src/androidTest/java/android/app/NativeActivityTest.java
@@ -0,0 +1,32 @@
+package android.app;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.Assert;
+import org.junit.runner.RunWith;
+import android.util.Log;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class NativeActivityTest {
+
+    @Rule
+    public ActivityTestRule<NativeActivity> mActivityTestRule = new ActivityTestRule<>(NativeActivity.class, false, false);
+
+    @Test(timeout = 1200000L)
+    public void runUnitTest() throws Exception {
+        Log.v("UnitTestRunner", "Start the unit test");
+        mActivityTestRule.launchActivity(null);
+        while (TestState.running) {
+            Log.v("UnitTestRunner", "Unit test is running...");
+            Thread.sleep(1000L);
+        }
+        Log.v("UnitTestRunner", "All unit tests are finished!");
+        mActivityTestRule.finishActivity();
+        Assert.assertTrue("UnitTestRunner was not successfully finished", TestState.testResult);
+    }
+}
diff --git a/test/android/app/src/androidTest/java/android/app/TestState.java b/test/android/app/src/androidTest/java/android/app/TestState.java
new file mode 100644
index 0000000000..b7d4b73543
--- /dev/null
+++ b/test/android/app/src/androidTest/java/android/app/TestState.java
@@ -0,0 +1,6 @@
+package android.app;
+
+public class TestState {
+    static boolean running = true;
+    static boolean testResult = true;
+}
diff --git a/test/android/app/src/main/AndroidManifest.xml b/test/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..40767881d1
--- /dev/null
+++ b/test/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.mapbox.mapboxsdk.maps.test_runner"
+          android:versionCode="1"
+          android:versionName="1.0">
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <application
+      android:allowBackup="false"
+      android:fullBackupContent="false"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/app_name"
+      android:hasCode="true">
+
+    <activity android:name="android.app.NativeActivity"
+              android:label="@string/app_name"
+              android:configChanges="orientation|keyboardHidden"
+              android:screenOrientation="portrait">
+      <meta-data android:name="android.app.lib_name"
+                 android:value="mbgl-test-runner" />
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+</manifest>
diff --git a/test/android/app/src/main/assets/to_zip.txt b/test/android/app/src/main/assets/to_zip.txt
new file mode 100644
index 0000000000..14725b7082
--- /dev/null
+++ b/test/android/app/src/main/assets/to_zip.txt
@@ -0,0 +1,3 @@
+test/results/
+test/fixtures/
+mapbox-gl-js/src/style-spec/reference/
diff --git a/test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..cde69bccce
--- /dev/null
+++ b/test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..c133a0cbd3
--- /dev/null
+++ b/test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..bfa42f0e7b
--- /dev/null
+++ b/test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..324e72cdd7
--- /dev/null
+++ b/test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/test/android/app/src/main/res/values/strings.xml b/test/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..98a5d2c02e
--- /dev/null
+++ b/test/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">UnitTestRunner</string>
+</resources>
diff --git a/test/android/build.gradle b/test/android/build.gradle
new file mode 100644
index 0000000000..de7242684e
--- /dev/null
+++ b/test/android/build.gradle
@@ -0,0 +1,21 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+       google()
+       jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/test/android/gradle.properties b/test/android/gradle.properties
new file mode 100644
index 0000000000..6ed0f8f960
--- /dev/null
+++ b/test/android/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536m
diff --git a/test/android/gradle/wrapper/gradle-wrapper.jar b/test/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..8c0fb64a86
--- /dev/null
+++ b/test/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/test/android/gradle/wrapper/gradle-wrapper.properties b/test/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..48c45760fb
--- /dev/null
+++ b/test/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Feb 05 19:39:12 IST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/test/android/gradlew b/test/android/gradlew
new file mode 100755
index 0000000000..91a7e269e1
--- /dev/null
+++ b/test/android/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/test/android/gradlew.bat b/test/android/gradlew.bat
new file mode 100644
index 0000000000..aec99730b4
--- /dev/null
+++ b/test/android/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off

+@rem ##########################################################################

+@rem

+@rem  Gradle startup script for Windows

+@rem

+@rem ##########################################################################

+

+@rem Set local scope for the variables with windows NT shell

+if "%OS%"=="Windows_NT" setlocal

+

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

+set DIRNAME=%~dp0

+if "%DIRNAME%" == "" set DIRNAME=.

+set APP_BASE_NAME=%~n0

+set APP_HOME=%DIRNAME%

+

+@rem Find java.exe

+if defined JAVA_HOME goto findJavaFromJavaHome

+

+set JAVA_EXE=java.exe

+%JAVA_EXE% -version >NUL 2>&1

+if "%ERRORLEVEL%" == "0" goto init

+

+echo.

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:findJavaFromJavaHome

+set JAVA_HOME=%JAVA_HOME:"=%

+set JAVA_EXE=%JAVA_HOME%/bin/java.exe

+

+if exist "%JAVA_EXE%" goto init

+

+echo.

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:init

+@rem Get command-line arguments, handling Windowz variants

+

+if not "%OS%" == "Windows_NT" goto win9xME_args

+if "%@eval[2+2]" == "4" goto 4NT_args

+

+:win9xME_args

+@rem Slurp the command line arguments.

+set CMD_LINE_ARGS=

+set _SKIP=2

+

+:win9xME_args_slurp

+if "x%~1" == "x" goto execute

+

+set CMD_LINE_ARGS=%*

+goto execute

+

+:4NT_args

+@rem Get arguments from the 4NT Shell from JP Software

+set CMD_LINE_ARGS=%$

+

+:execute

+@rem Setup the command line

+

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+

+@rem Execute Gradle

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+

+:end

+@rem End local scope for the variables with windows NT shell

+if "%ERRORLEVEL%"=="0" goto mainEnd

+

+:fail

+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

+rem the _cmd.exe /c_ return code!

+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

+exit /b 1

+

+:mainEnd

+if "%OS%"=="Windows_NT" endlocal

+

+:omega

diff --git a/test/android/settings.gradle b/test/android/settings.gradle
new file mode 100644
index 0000000000..573abcb323
--- /dev/null
+++ b/test/android/settings.gradle
@@ -0,0 +1,2 @@
+include ':app'
+
diff --git a/test/src/mbgl/test/test.cpp b/test/src/mbgl/test/test.cpp
index 30df01c488..12a3dff720 100644
--- a/test/src/mbgl/test/test.cpp
+++ b/test/src/mbgl/test/test.cpp
@@ -1,12 +1,9 @@
 #include <mbgl/actor/scheduler.hpp>
-#include <mbgl/gfx/backend.hpp>
 #include <mbgl/test.hpp>
 #include <mbgl/test/util.hpp>
 
 #include <gtest/gtest.h>
 
-#include <args.hxx>
-
 namespace mbgl {
 
 int runTests(int argc, char *argv[]) {
@@ -16,11 +13,6 @@ int runTests(int argc, char *argv[]) {
 
     testing::InitGoogleTest(&argc, argv);
 
-    args::ArgumentParser argumentParser("Unit tests");
-    args::ValueFlag<std::string> backendValue(argumentParser, "Backend", "Rendering backend", {"backend"});
-
-    argumentParser.ParseCLI(argc, argv);
-
     return RUN_ALL_TESTS();
 }