diff options
| author | zmiao <miao.zhao@mapbox.com> | 2019-11-19 20:45:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 20:45:30 +0200 |
| commit | 1b58e87f154bf7d3d5f38ef32cc4b171362f73a2 (patch) | |
| tree | cf692c1fbee906e2370ec0f6d684d5b5bb838e61 /next | |
| parent | abdd32d11fcd9cebe0631afbfd2aba9e78c7d790 (diff) | |
| download | qtlocation-mapboxgl-1b58e87f154bf7d3d5f38ef32cc4b171362f73a2.tar.gz | |
[render-test] Wrap test data inside RenderTestRunner App + Add a new test app (#15887)
* [render-test] Wrap test resources inside app
* [render-test] Add test app
* fix test app failure
* [render-test]add callback + add javaObjectWrapper
Diffstat (limited to 'next')
| -rw-r--r-- | next/platform/android/android.cmake | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 06183291db..e086f8b75b 100644 --- a/next/platform/android/android.cmake +++ b/next/platform/android/android.cmake @@ -338,6 +338,47 @@ target_link_libraries( mbgl-render-test ) +add_custom_command( + TARGET mbgl-render-test-runner PRE_BUILD + COMMAND + ${CMAKE_COMMAND} + -E + copy + ${MBGL_ROOT}/render-test/android-manifest.json + ${MBGL_ROOT}/android-manifest.json + COMMAND + ${CMAKE_COMMAND} + -E + copy + ${MBGL_ROOT}/platform/node/test/ignores.json + ${MBGL_ROOT}/ignores/ignores.json + COMMAND + ${CMAKE_COMMAND} + -E + copy + ${MBGL_ROOT}/render-test/linux-ignores.json + ${MBGL_ROOT}/ignores/linux-ignores.json + COMMAND + ${CMAKE_COMMAND} + -E + tar + "cf" + "render-test/android/app/src/main/assets/data.zip" + --format=zip + --files-from=render-test/android/app/src/main/assets/to_zip.txt + COMMAND + ${CMAKE_COMMAND} + -E + remove_directory + ${MBGL_ROOT}/ignores + COMMAND + ${CMAKE_COMMAND} + -E + remove + ${MBGL_ROOT}/android-manifest.json + WORKING_DIRECTORY ${MBGL_ROOT} +) + # 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") |