Android render test quality of life (#2200)

maplibre · Mar 15, 2024 · 3e0d23d · 3e0d23d
1 parent 63ea5dc
commit 3e0d23d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -120,7 +120,6 @@ jobs:
           fi
 
       - name: Build Benchmark, copy to platform/android
-        if: github.ref != 'refs/heads/main'
         run: |
           ./gradlew assembleDrawableRelease assembleDrawableReleaseAndroidTest -PtestBuildType=release
           cp MapboxGLAndroidSDKTestApp/build/outputs/apk/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk .

diff --git a/render-test/android/app/build.gradle b/render-test/android/app/build.gradle
@@ -3,6 +3,12 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 33
 
+    sourceSets {
+        test {
+            assets.srcDirs += ['../../../metrics']
+        }
+    }
+
     defaultConfig {
         applicationId = 'org.maplibre.render_test_runner'
         minSdkVersion 21

diff --git a/render-test/manifest_parser.cpp b/render-test/manifest_parser.cpp
@@ -287,9 +287,7 @@ std::optional<Manifest> ManifestParser::parseManifest(const std::string& manifes
             testId = testId.substr(rootLength + 1, testId.length() - rootLength - 1);
 
             std::vector<mbgl::filesystem::path> expectedMetricPaths{expectedMetricPath};
-#if defined(__ANDROID__)
-            expectedMetricPaths.emplace_back("/sdcard/baselines/");
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
             expectedMetricPaths.emplace_back(manifest.manifestPath + "/baselines/");
 #endif
             testPaths.emplace_back(testPath,