diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-12 13:55:25 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-12 23:11:35 +0200 |
| commit | 29b17fa335388c9b93f70c29b2398cf2fee65785 (patch) | |
| tree | 997c990f067aa2cb52cd11a47a7a7f99d28b98b9 /cmake/QtPlatformAndroid.cmake | |
| parent | 1777ddc234bb51dcf9b9c251e3872cc733a06e34 (diff) | |
CMake: fix running Android tests
Android *.so files need to CXX visibility to default after
qt_set_common_target_properties() which was setting it to hidden.
Also, pass the correct androidtestrunner arguments for cmake check
target
Fixes: QTBUG-88228
Change-Id: Ia29cdc9e65153c9669f3ec06f74a46f8fcd8c507
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPlatformAndroid.cmake')
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index a038fdfb98..f9d1835dd3 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -140,9 +140,8 @@ function(qt_internal_android_add_test target) add_test(NAME "${target}" COMMAND "${test_runner}" - --androiddeployqt "${deployment_tool} --input ${deployment_file}" - --adb "${ANDROID_SDK_ROOT}/platform-tools/adb" --path "${apk_dir}" + --adb "${ANDROID_SDK_ROOT}/platform-tools/adb" --skip-install-root --make "${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${target}_make_apk" --apk "${apk_dir}/${target}.apk" |