[test-runner] Update folder location, change app configureation

20 files changed, 34 insertions, 65 deletions

diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 9894eaa58d..eecd7c9a4c 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -319,8 +319,8 @@ add_library(
     ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c
     ${MBGL_ROOT}/platform/android/src/test/render_test_runner.cpp
     ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
-    ${MBGL_ROOT}/render-test/android-test-runner/render_test_collator.cpp
-    ${MBGL_ROOT}/render-test/android-test-runner/render_test_number_format.cpp
+    ${MBGL_ROOT}/platform/android/src/test/render_test_collator.cpp
+    ${MBGL_ROOT}/platform/android/src/test/render_test_number_format.cpp
 )
 
 target_include_directories(
diff --git a/platform/android-test-runner/build.gradle b/platform/android-test-runner/build.gradle
deleted file mode 100644
index eef418019a..0000000000
--- a/platform/android-test-runner/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.3.1'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/platform/android-test-runner/gradle.properties b/platform/android-test-runner/gradle.properties
deleted file mode 100644
index 7bef3c2321..0000000000
--- a/platform/android-test-runner/gradle.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
diff --git a/render-test/android-test-runner/render_test_collator.cpp b/platform/android/src/test/render_test_collator.cpp
index e6e3b27b48..e6e3b27b48 100644
--- a/render-test/android-test-runner/render_test_collator.cpp
+++ b/platform/android/src/test/render_test_collator.cpp
diff --git a/render-test/android-test-runner/render_test_number_format.cpp b/platform/android/src/test/render_test_number_format.cpp
index 57710c8558..57710c8558 100644
--- a/render-test/android-test-runner/render_test_number_format.cpp
+++ b/platform/android/src/test/render_test_number_format.cpp
diff --git a/platform/android-test-runner/app/build.gradle b/render-test/android/app/build.gradle
index 3714ae29bf..60609e3ba2 100644
--- a/platform/android-test-runner/app/build.gradle
+++ b/render-test/android/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        applicationId = 'com.example.native_activity'
+        applicationId = 'com.mapbox.mapboxsdk.maps.render_test_runner'
         minSdkVersion 14
         targetSdkVersion 28
         externalNativeBuild {
@@ -15,13 +15,6 @@ android {
             }
         }
     }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro'
-        }
-    }
     externalNativeBuild {
         cmake {
             version '3.10.2'
@@ -31,7 +24,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/platform/android-test-runner/app/src/main/AndroidManifest.xml b/render-test/android/app/src/main/AndroidManifest.xml
index 191c04c2c7..6c7af7ed8f 100644
--- a/platform/android-test-runner/app/src/main/AndroidManifest.xml
+++ b/render-test/android/app/src/main/AndroidManifest.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- BEGIN_INCLUDE(manifest) -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.native_activity"
           android:versionCode="1"
           android:versionName="1.0">
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <!-- This .apk has no Java code itself, so set hasCode to false. -->
   <application
       android:allowBackup="false"
       android:fullBackupContent="false"
@@ -13,12 +11,9 @@
       android:label="@string/app_name"
       android:hasCode="false">
 
-    <!-- Our activity is the built-in NativeActivity framework class.
-         This will take care of integrating with our NDK code. -->
     <activity android:name="android.app.NativeActivity"
               android:label="@string/app_name"
-              android:configChanges="orientation|keyboardHidden">
-      <!-- Tell NativeActivity the name of our .so -->
+              android:screenOrientation="portrait">
       <meta-data android:name="android.app.lib_name"
                  android:value="mbgl-render-test-runner" />
       <intent-filter>
@@ -29,4 +24,3 @@
   </application>
 
 </manifest>
-<!-- END_INCLUDE(manifest) -->
diff --git a/platform/android-test-runner/app/src/main/res/mipmap-hdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bccce..cde69bccce 100644
--- a/platform/android-test-runner/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/render-test/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/platform/android-test-runner/app/src/main/res/mipmap-mdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0cbd3..c133a0cbd3 100644
--- a/platform/android-test-runner/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/render-test/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/platform/android-test-runner/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0e7b..bfa42f0e7b 100644
--- a/platform/android-test-runner/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/render-test/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/platform/android-test-runner/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/render-test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72cdd7..324e72cdd7 100644
--- a/platform/android-test-runner/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/render-test/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/platform/android-test-runner/app/src/main/res/values/strings.xml b/render-test/android/app/src/main/res/values/strings.xml
index d8f551374e..00b181ca34 100644
--- a/platform/android-test-runner/app/src/main/res/values/strings.xml
+++ b/render-test/android/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">NativeActivity</string>
+    <string name="app_name">RenderTestRunner</string>
 </resources>
diff --git a/render-test/android/build.gradle b/render-test/android/build.gradle
new file mode 100644
index 0000000000..e58b831f71
--- /dev/null
+++ b/render-test/android/build.gradle
@@ -0,0 +1,16 @@
+buildscript {
+    repositories {
+       google()
+       jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.1'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
diff --git a/render-test/android/gradle.properties b/render-test/android/gradle.properties
new file mode 100644
index 0000000000..2427fd0bf4
--- /dev/null
+++ b/render-test/android/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1536m
\ No newline at end of file
diff --git a/platform/android-test-runner/gradle/wrapper/gradle-wrapper.jar b/render-test/android/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a86..8c0fb64a86 100644
--- a/platform/android-test-runner/gradle/wrapper/gradle-wrapper.jar
+++ b/render-test/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/platform/android-test-runner/gradle/wrapper/gradle-wrapper.properties b/render-test/android/gradle/wrapper/gradle-wrapper.properties
index a899529251..2e4993ee89 100644
--- a/platform/android-test-runner/gradle/wrapper/gradle-wrapper.properties
+++ b/render-test/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 05 19:39:12 IST 2017
+#Mon Oct 21 12:45:47 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/platform/android-test-runner/gradlew b/render-test/android/gradlew
index 91a7e269e1..91a7e269e1 100755
--- a/platform/android-test-runner/gradlew
+++ b/render-test/android/gradlew
diff --git a/platform/android-test-runner/gradlew.bat b/render-test/android/gradlew.bat
index aec99730b4..aec99730b4 100644
--- a/platform/android-test-runner/gradlew.bat
+++ b/render-test/android/gradlew.bat
diff --git a/render-test/android-test-runner/render_test_setup.sh b/render-test/android/render_test_setup.sh
index 77d9690292..edcff3ca30 100755
--- a/render-test/android-test-runner/render_test_setup.sh
+++ b/render-test/android/render_test_setup.sh
@@ -2,19 +2,26 @@
 
 adb shell rm -rf /sdcard/render-test
 adb shell mkdir /sdcard/render-test
+adb shell mkdir /sdcard/render-test/vendor
+adb shell mkdir /sdcard/render-test/expected
 
 adb push ../../mapbox-gl-js/test/integration/render-tests /sdcard/render-test/mapbox-gl-js/test/integration/render-tests
 adb push ../../mapbox-gl-js/test/integration/query-tests /sdcard/render-test/mapbox-gl-js/test/integration/query-tests 
 adb push ../../mapbox-gl-js/test/integration/tiles /sdcard/render-test/mapbox-gl-js/test/integration/tiles
 adb push ../../mapbox-gl-js/test/integration/glyphs /sdcard/render-test/mapbox-gl-js/test/integration/glyphs
-adb push ../../mapbox-gl-js/test/integration/sprites /sdcard/render-test/mapbox-gl-js/test/integration/sprites
 adb push ../../mapbox-gl-js/test/integration/styles /sdcard/render-test/mapbox-gl-js/test/integration/styles 
 adb push ../../mapbox-gl-js/test/integration/tilesets /sdcard/render-test/mapbox-gl-js/test/integration/tilesets 
 adb push ../../mapbox-gl-js/test/integration/image /sdcard/render-test/mapbox-gl-js/test/integration/image 
 adb push ../../mapbox-gl-js/test/integration/video /sdcard/render-test/mapbox-gl-js/test/integration/video 
-adb push ../../vendor/mapbox-gl-styles/styles /sdcard/render-test/mapbox-gl-js/test/integration/mapbox-gl-styles/styles 
+adb push ../../vendor/mapbox-gl-styles/styles /sdcard/render-test/vendor/mapbox-gl-styles/styles 
+adb push ../../vendor/mapbox-gl-styles/sprites /sdcard/render-test/vendor/mapbox-gl-styles/sprites 
 adb push ../../mapbox-gl-js/test/integration/data /sdcard/render-test/mapbox-gl-js/test/integration/data 
 adb push ../../mapbox-gl-js/test/integration/geojson /sdcard/render-test/mapbox-gl-js/test/integration/geojson 
 adb push ../../render-test/expected /sdcard/render-test/render-test/expected
 
-adb shell ls /sdcard/render-test/mapbox-gl-js/test/integration
\ No newline at end of file
+mkdir sprites
+cp -r ../../mapbox-gl-js/test/integration/sprites/ sprites
+adb push sprites /sdcard/render-test/mapbox-gl-js/test/integration/sprites
+rm -rf sprites
+
+adb shell ls /sdcard/render-test/
\ No newline at end of file
diff --git a/platform/android-test-runner/settings.gradle b/render-test/android/settings.gradle
index 573abcb323..573abcb323 100644
--- a/platform/android-test-runner/settings.gradle
+++ b/render-test/android/settings.gradle