From 47028a62e2afc488f608656268c7d43f451e3abe Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Mon, 18 Dec 2023 23:31:38 +0100
Subject: [PATCH] Use debug build for Android UI tests (CI) (#1976)

---
 .github/workflows/android-ci.yml                     |  9 +++++----
 .../android/MapboxGLAndroidSDKTestApp/build.gradle   | 12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 498deb6ad..0e919a54f 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -121,7 +121,7 @@ jobs:
       - name: Build Benchmark, copy to platform/android
         if: github.ref != 'refs/heads/main'
         run: |
-          ./gradlew assembleDrawableRelease assembleDrawableReleaseAndroidTest
+          ./gradlew assembleDrawableRelease assembleDrawableReleaseAndroidTest -PtestBuildType=release
           cp MapboxGLAndroidSDKTestApp/build/outputs/apk/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk .
           cp MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk .
 
@@ -140,7 +140,8 @@ jobs:
 
       - name: Build UI tests
         if: github.ref == 'refs/heads/main'
-        run: make android-ui-test-arm-v8
+        run: |
+          ./gradlew assembleLegacyDebug assembleLegacyDebugAndroidTest -PtestBuildType=debug
 
       - name: Configure AWS Credentials
         if: github.ref == 'refs/heads/main'
@@ -174,8 +175,8 @@ jobs:
       - name: Upload Android UI test
         if: github.ref == 'refs/heads/main'
         run: |
-          curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/legacy/release/MapboxGLAndroidSDKTestApp-legacy-debug.apk '${{ steps.upload-android-app.outputs.url }}'
-          curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/legacy/release/MapboxGLAndroidSDKTestApp-legacy-debug-androidTest.apk '${{ steps.upload-android-test.outputs.url }}'
+          curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/legacy/debug/MapboxGLAndroidSDKTestApp-legacy-debug.apk '${{ steps.upload-android-app.outputs.url }}'
+          curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/legacy/debug/MapboxGLAndroidSDKTestApp-legacy-debug-androidTest.apk '${{ steps.upload-android-test.outputs.url }}'
 
       - name: Write uploads.env
         if: github.ref == 'refs/heads/main'
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 139154ce6..ef87a583e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -7,6 +7,16 @@ plugins {
 
 apply from: "${rootDir}/gradle/native-build.gradle"
 
+def obtainTestBuildType() {
+    def result = "debug";
+
+    if (project.hasProperty("testBuildType")) {
+        result = project.getProperties().get("testBuildType")
+    }
+
+    result
+}
+
 android {
     compileSdkVersion androidVersions.compileSdkVersion
 
@@ -55,7 +65,7 @@ android {
         }
     }
 
-    testBuildType "release" // for benchmark
+    testBuildType obtainTestBuildType()
 
     flavorDimensions += "renderer"
     productFlavors {