From 29b17fa335388c9b93f70c29b2398cf2fee65785 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 12 Nov 2020 13:55:25 +0200 Subject: 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 --- cmake/QtPlatformAndroid.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cmake/QtPlatformAndroid.cmake') 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" -- cgit v1.2.3