[test-runner] Fix failed tests, generate android specific expectations;x

19 files changed, 189 insertions, 189 deletions

diff --git a/circle.yml b/circle.yml
index 27cdf7c0ea..1169cacfb9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,192 +4,192 @@ workflows:
   version: 2
   mbgl-next:
     jobs:
-      - next-sanity-checks
+      # - next-sanity-checks
       - next-android-render-test-runner
-      - next-build-template:
-          name: next-android-armeabi-v7a-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=armeabi-v7a'
-          install: true
-      - next-build-template:
-          name: next-android-arm64-v8a-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a'
-          install: true
-      - next-build-template:
-          name: next-android-x86-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
-          install: true
-      - next-build-template:
-          name: next-android-x86_64-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64'
-          install: true
-      - next-build-template:
-          name: next-linux-gcc8-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'
-          install: true
-      - next-build-template:
-          name: next-linux-gcc4.9-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-linux-gcc8-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9'
-          build_params: '--target mbgl-glfw'
-          test_params: '-N -Q'
-      - next-build-template:
-          name: next-linux-gcc8-debug-coverage
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-linux-gcc8-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_BUILD_TYPE=DebugCoverage'
-      - next-build-template:
-          name: next-linux-clang8-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-android-armeabi-v7a-release
-            - next-android-arm64-v8a-release
-            - next-android-x86-release
-            - next-android-x86_64-release
-            - next-linux-gcc8-release
-            - next-macos-xcode11-release
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8'
-          install: true
-          binary_size_metrics: true
-      - next-build-template:
-          name: next-FIXME-linux-asan
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-sanity-checks
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=address'
-          test_params: '|| true'
-      - next-build-template:
-          name: next-linux-tsan
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-sanity-checks
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=thread'
-      - next-build-template:
-          name: next-FIXME-linux-valgrind
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_CXX_FLAGS=-DSANITIZE'
-          test_params: '-j 4 -E "mbgl-node|gl-benchmark" -D ExperimentalMemCheck || true'
-      - next-build-template:
-          name: next-FIXME-linux-ubsan
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-sanity-checks
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=undefined'
-          test_params: '|| true'
-      - next-build-template:
-          name: next-qt5-linux-gcc5-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DMBGL_WITH_QT=ON'
-      - next-build-template:
-          name: next-qt5-macos-gcc5-release
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          requires:
-            - next-qt5-linux-gcc5-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)'
-          test_params: '-N -Q'
-      - next-build-template:
-          name: next-macos-xcode11-release
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
-          install: true
-      - next-build-template:
-          name: next-macos-xcode11-debug
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          requires:
-            - next-macos-xcode11-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug'
-      - next-build-template:
-          name: next-ios-xcode11-release
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator'
-          test_params: '-Q -N'
-  mbgl-legacy:
-    jobs:
-      #
-      # Naming convention: {platform}-{additional description}-{build type}
-      #   - {platform} is the client platform/framework, which may differ from
-      #     the build platform. Specify both if applicable, e.g., "qt5-macos".
-      #   - {additional description} optionally describes the compiler or other
-      #     unique aspect of the build environment.
-      #   - {build type} is typically "debug" or "release".
-      #
-      - android-debug-arm-v7-buck
-      - android-arm-template:
-          name: android-debug-arm-v8
-      - android-arm-template:
-          name: android-gnustl-arm-v7
-          stl: gnustl_shared
-          firebase_device_id: "flo"
-          firebase_device_os: "21"
-          image: android-ndk-r17c:1d5db0eb34
-          abi: arm-v7
-      - android-release:
-          filters:
-            tags:
-              only: /android-v.*/
-      - node-linux-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - node-macos-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - linux-clang-7-sanitize-address-undefined
-      - linux-clang-7-sanitize-thread
-      - linux-gcc5-debug-coverage
-      - linux-doxygen
-      - ios-debug
-      - ios-debug-xcode10
-      - ios-release-template:
-          name: ios-release
-      - ios-release-tag:
-          filters:
-            tags:
-              only: /ios-.*/
-            branches:
-              ignore: /.*/
-      - macos-debug
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 5 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - metrics-nightly
-      - ios-release-template:
-          name: ios-release-nightly
-      - ios-sanitize-nightly
-      - ios-sanitize-address-nightly
-      - ios-static-analyzer-nightly
-      - ios-static-analyzer-nightly-xcode10
+  #     - next-build-template:
+  #         name: next-android-armeabi-v7a-release
+  #         executor_name: ubuntu-disco
+  #         target_is_android: true
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=armeabi-v7a'
+  #         install: true
+  #     - next-build-template:
+  #         name: next-android-arm64-v8a-release
+  #         executor_name: ubuntu-disco
+  #         target_is_android: true
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a'
+  #         install: true
+  #     - next-build-template:
+  #         name: next-android-x86-release
+  #         executor_name: ubuntu-disco
+  #         target_is_android: true
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
+  #         install: true
+  #     - next-build-template:
+  #         name: next-android-x86_64-release
+  #         executor_name: ubuntu-disco
+  #         target_is_android: true
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64'
+  #         install: true
+  #     - next-build-template:
+  #         name: next-linux-gcc8-release
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'
+  #         install: true
+  #     - next-build-template:
+  #         name: next-linux-gcc4.9-release
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         requires:
+  #           - next-linux-gcc8-release
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9'
+  #         build_params: '--target mbgl-glfw'
+  #         test_params: '-N -Q'
+  #     - next-build-template:
+  #         name: next-linux-gcc8-debug-coverage
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         requires:
+  #           - next-linux-gcc8-release
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_BUILD_TYPE=DebugCoverage'
+  #     - next-build-template:
+  #         name: next-linux-clang8-release
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         requires:
+  #           - next-android-armeabi-v7a-release
+  #           - next-android-arm64-v8a-release
+  #           - next-android-x86-release
+  #           - next-android-x86_64-release
+  #           - next-linux-gcc8-release
+  #           - next-macos-xcode11-release
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8'
+  #         install: true
+  #         binary_size_metrics: true
+  #     - next-build-template:
+  #         name: next-FIXME-linux-asan
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         requires:
+  #           - next-sanity-checks
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=address'
+  #         test_params: '|| true'
+  #     - next-build-template:
+  #         name: next-linux-tsan
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         requires:
+  #           - next-sanity-checks
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=thread'
+  #     - next-build-template:
+  #         name: next-FIXME-linux-valgrind
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_CXX_FLAGS=-DSANITIZE'
+  #         test_params: '-j 4 -E "mbgl-node|gl-benchmark" -D ExperimentalMemCheck || true'
+  #     - next-build-template:
+  #         name: next-FIXME-linux-ubsan
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         requires:
+  #           - next-sanity-checks
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=undefined'
+  #         test_params: '|| true'
+  #     - next-build-template:
+  #         name: next-qt5-linux-gcc5-release
+  #         executor_name: ubuntu-disco
+  #         target_is_linux: true
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DMBGL_WITH_QT=ON'
+  #     - next-build-template:
+  #         name: next-qt5-macos-gcc5-release
+  #         executor_name: macos-11_0_0
+  #         target_is_macos: true
+  #         requires:
+  #           - next-qt5-linux-gcc5-release
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)'
+  #         test_params: '-N -Q'
+  #     - next-build-template:
+  #         name: next-macos-xcode11-release
+  #         executor_name: macos-11_0_0
+  #         target_is_macos: true
+  #         config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=workspace/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
+  #         install: true
+  #     - next-build-template:
+  #         name: next-macos-xcode11-debug
+  #         executor_name: macos-11_0_0
+  #         target_is_macos: true
+  #         requires:
+  #           - next-macos-xcode11-release
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug'
+  #     - next-build-template:
+  #         name: next-ios-xcode11-release
+  #         executor_name: macos-11_0_0
+  #         target_is_macos: true
+  #         config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator'
+  #         test_params: '-Q -N'
+  # mbgl-legacy:
+  #   jobs:
+  #     #
+  #     # Naming convention: {platform}-{additional description}-{build type}
+  #     #   - {platform} is the client platform/framework, which may differ from
+  #     #     the build platform. Specify both if applicable, e.g., "qt5-macos".
+  #     #   - {additional description} optionally describes the compiler or other
+  #     #     unique aspect of the build environment.
+  #     #   - {build type} is typically "debug" or "release".
+  #     #
+  #     - android-debug-arm-v7-buck
+  #     - android-arm-template:
+  #         name: android-debug-arm-v8
+  #     - android-arm-template:
+  #         name: android-gnustl-arm-v7
+  #         stl: gnustl_shared
+  #         firebase_device_id: "flo"
+  #         firebase_device_os: "21"
+  #         image: android-ndk-r17c:1d5db0eb34
+  #         abi: arm-v7
+  #     - android-release:
+  #         filters:
+  #           tags:
+  #             only: /android-v.*/
+  #     - node-linux-release:
+  #         filters:
+  #           tags:
+  #             only: /node-.*/
+  #     - node-macos-release:
+  #         filters:
+  #           tags:
+  #             only: /node-.*/
+  #     - linux-clang-7-sanitize-address-undefined
+  #     - linux-clang-7-sanitize-thread
+  #     - linux-gcc5-debug-coverage
+  #     - linux-doxygen
+  #     - ios-debug
+  #     - ios-debug-xcode10
+  #     - ios-release-template:
+  #         name: ios-release
+  #     - ios-release-tag:
+  #         filters:
+  #           tags:
+  #             only: /ios-.*/
+  #           branches:
+  #             ignore: /.*/
+  #     - macos-debug
+  # nightly:
+  #   triggers:
+  #     - schedule:
+  #         cron: "0 5 * * *"
+  #         filters:
+  #           branches:
+  #             only:
+  #               - master
+  #   jobs:
+  #     - metrics-nightly
+  #     - ios-release-template:
+  #         name: ios-release-nightly
+  #     - ios-sanitize-nightly
+  #     - ios-sanitize-address-nightly
+  #     - ios-static-analyzer-nightly
+  #     - ios-static-analyzer-nightly-xcode10
 
 executors:
   ubuntu-disco:
diff --git a/render-test/android-manifest.json b/render-test/android-manifest.json
index ddc91d1933..00783aba60 100644
--- a/render-test/android-manifest.json
+++ b/render-test/android-manifest.json
@@ -1,10 +1,10 @@
 {
     "base_test_path":"mapbox-gl-js/test/integration",
-    "expectation_paths":["render-test/expected"],
+    "expectation_paths":["render-test/expected", "render-test/expected/android"],
     "ignore_paths":["ignores/ignores.json", "ignores/linux-ignores.json"],
     "vendor_path":"vendor",
     "asset_path": "mapbox-gl-js/test/integration",
-    "result_path":"/sdcard/",
+    "result_path": "/sdcard/",
     "probes": ["probeGFX", "probeNetwork"],
     "metric_path":"render-test/metrics/android"
-}
\ No newline at end of file
+}  
diff --git a/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt
index fbf9539583..048e1aae1b 100644
--- a/render-test/android/app/src/main/assets/to_zip.txt
+++ b/render-test/android/app/src/main/assets/to_zip.txt
@@ -16,4 +16,4 @@ ignores/
 render-test/metrics/android/
 render-test/expected/
 android-manifest-probe-network-gfx.json
-android-manifest-probe-memory.json
\ No newline at end of file
+android-manifest-probe-memory.json
diff --git a/render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png b/render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png
new file mode 100644
index 0000000000..6a14209d0d
--- /dev/null
+++ b/render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png
diff --git a/render-test/expected/android/render-tests/line-pattern/overscaled/expected.png b/render-test/expected/android/render-tests/line-pattern/overscaled/expected.png
new file mode 100644
index 0000000000..feded75a23
--- /dev/null
+++ b/render-test/expected/android/render-tests/line-pattern/overscaled/expected.png
diff --git a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png
new file mode 100644
index 0000000000..99ca724f5b
--- /dev/null
+++ b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png
diff --git a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5911a/expected.png b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5911a/expected.png
new file mode 100644
index 0000000000..a650164002
--- /dev/null
+++ b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5911a/expected.png
diff --git a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png
new file mode 100644
index 0000000000..37fc500689
--- /dev/null
+++ b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png
diff --git a/render-test/expected/android/render-tests/regressions/mapbox-gl-native#9976/expected.png b/render-test/expected/android/render-tests/regressions/mapbox-gl-native#9976/expected.png
new file mode 100644
index 0000000000..a392bed4ab
--- /dev/null
+++ b/render-test/expected/android/render-tests/regressions/mapbox-gl-native#9976/expected.png
diff --git a/render-test/expected/android/render-tests/runtime-styling/image-add-pattern/expected.png b/render-test/expected/android/render-tests/runtime-styling/image-add-pattern/expected.png
new file mode 100644
index 0000000000..e2d87a3d11
--- /dev/null
+++ b/render-test/expected/android/render-tests/runtime-styling/image-add-pattern/expected.png
diff --git a/render-test/expected/android/render-tests/runtime-styling/image-update-pattern/expected.png b/render-test/expected/android/render-tests/runtime-styling/image-update-pattern/expected.png
new file mode 100644
index 0000000000..e2d87a3d11
--- /dev/null
+++ b/render-test/expected/android/render-tests/runtime-styling/image-update-pattern/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-1x-icon/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-1x-icon/expected.png
new file mode 100644
index 0000000000..8a5a9652a7
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/1x-screen-1x-icon/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png
new file mode 100644
index 0000000000..e4564aeee8
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-2x-icon/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-2x-icon/expected.png
new file mode 100644
index 0000000000..235f5170f3
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/1x-screen-2x-icon/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png
new file mode 100644
index 0000000000..8cf3bb4bda
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-1x-icon/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-1x-icon/expected.png
new file mode 100644
index 0000000000..6fd28edf16
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/2x-screen-1x-icon/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png
new file mode 100644
index 0000000000..0756d83652
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-2x-icon/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-2x-icon/expected.png
new file mode 100644
index 0000000000..7ef7af0ab4
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/2x-screen-2x-icon/expected.png
diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png
new file mode 100644
index 0000000000..a3b27f24a2
--- /dev/null
+++ b/render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png