try

2 files changed, 43 insertions, 43 deletions

diff --git a/circle.yml b/circle.yml
index d453d7670c..31a0b1f84c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -675,7 +675,7 @@ jobs:
           name: Build RenderTestRunner APK
           command: |
             cd render-test/android
-            ./gradlew --parallel --max-workers=8 -Pmapbox.abis=armeabi-v7a app:assembleDebug app:assembleDebugAndroidTest
+            ./gradlew --parallel --max-workers=8 -Pmapbox.abis=arm64-v8a app:assembleDebug app:assembleDebugAndroidTest
       - login-google-cloud-platform
       - run:
           name: Run render test runner on Firebase
@@ -688,7 +688,7 @@ jobs:
               gcloud firebase test android run --type instrumentation \
                 --app render-test/android/app/build/outputs/apk/debug/app-debug.apk \
                 --test render-test/android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
-                --device-ids flo --os-version-ids 21 --locales en \
+                --device-ids sailfish --os-version-ids 26 --locales en --orientations portrait --timeout 20m \
                 --environment-variables coverage=true,coverageFile="/sdcard/coverage.ec",testResult="/sdcard/render-tests_index.html" --directories-to-pull /sdcard --results-dir mapbox-android-sdk-${CIRCLE_BUILD_NUM}
               coverageFile=`gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/mapbox-android-sdk-${CIRCLE_BUILD_NUM}/**/*.ec | tail -1`
               testResult=`gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/mapbox-android-sdk-${CIRCLE_BUILD_NUM}/**/*.html | tail -1`
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 9d21a35d2e..454cc761f2 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -299,8 +299,47 @@ add_executable(
     ${MBGL_ROOT}/platform/android/src/test/test_runner.cpp
 )
 
+target_link_libraries(
+    mbgl-test-runner
+    PRIVATE Mapbox::Base::jni.hpp mapbox-gl mbgl-test
+)
+
+add_executable(
+    mbgl-benchmark-runner
+    ${MBGL_ROOT}/platform/android/src/test/benchmark_runner.cpp ${MBGL_ROOT}/platform/android/src/test/runtime.cpp
+    ${MBGL_ROOT}/platform/android/src/test/runtime.hpp
+)
+
+target_link_libraries(
+    mbgl-benchmark-runner
+    PRIVATE Mapbox::Base::jni.hpp mapbox-gl mbgl-benchmark
+)
+
+add_library(
+    mbgl-render-test-runner SHARED
+    ${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}/platform/android/src/test/render_test_collator.cpp
+    ${MBGL_ROOT}/platform/android/src/test/render_test_number_format.cpp
+)
+
+target_include_directories(
+    mbgl-render-test-runner
+    PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue ${MBGL_ROOT}/platform/android/src ${MBGL_ROOT}/src
+)
+
+target_link_libraries(
+    mbgl-render-test-runner
+    PRIVATE
+        Mapbox::Base::jni.hpp
+        android
+        log
+        mbgl-render-test
+)
+
 add_custom_command(
-    TARGET mbgl-test-runner PRE_BUILD
+    TARGET mbgl-render-test-runner PRE_BUILD
     COMMAND
         ${CMAKE_COMMAND}
         -E
@@ -401,7 +440,7 @@ add_custom_command(
         ${CMAKE_COMMAND}
         -E
         tar
-        "cf"
+        "cfv"
         "data.zip"
         --format=zip
         --files-from=${MBGL_ROOT}/render-test/android/app/src/main/assets/to_zip.txt
@@ -438,45 +477,6 @@ add_custom_command(
     WORKING_DIRECTORY ${MBGL_ROOT}/render-test/android/app/src/main/assets
 )
 
-target_link_libraries(
-    mbgl-test-runner
-    PRIVATE Mapbox::Base::jni.hpp mapbox-gl mbgl-test
-)
-
-add_executable(
-    mbgl-benchmark-runner
-    ${MBGL_ROOT}/platform/android/src/test/benchmark_runner.cpp ${MBGL_ROOT}/platform/android/src/test/runtime.cpp
-    ${MBGL_ROOT}/platform/android/src/test/runtime.hpp
-)
-
-target_link_libraries(
-    mbgl-benchmark-runner
-    PRIVATE Mapbox::Base::jni.hpp mapbox-gl mbgl-benchmark
-)
-
-add_library(
-    mbgl-render-test-runner SHARED
-    ${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}/platform/android/src/test/render_test_collator.cpp
-    ${MBGL_ROOT}/platform/android/src/test/render_test_number_format.cpp
-)
-
-target_include_directories(
-    mbgl-render-test-runner
-    PRIVATE ${ANDROID_NDK}/sources/android/native_app_glue ${MBGL_ROOT}/platform/android/src ${MBGL_ROOT}/src
-)
-
-target_link_libraries(
-    mbgl-render-test-runner
-    PRIVATE
-        Mapbox::Base::jni.hpp
-        android
-        log
-        mbgl-render-test
-)
-
 # Android has no concept of MinSizeRel on android.toolchain.cmake and provides configurations tuned for binary size. We can push it a bit
 # more with code folding and LTO.
 set_target_properties(example-custom-layer PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe")