diff options
| author | Alexey Edelev <semlanik@gmail.com> | 2021-10-18 13:27:55 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-10-29 19:32:16 +0200 |
| commit | 388136e860c51f0d00026b8be831d562f8193704 (patch) | |
| tree | 30a445a89a951cc69a3fa124971a3d354ce50b39 /src/corelib/Qt6AndroidMacros.cmake | |
| parent | a670839c61b6e7957bfacab0b51990f9ad37ffe1 (diff) | |
Add --no-rcc-bundle-cleanup option to androiddeployqt tool
Add --no-rcc-bundle-cleanup option to androiddeployqt tool that helps
to debug android build procedures and check the raw rcc bundle for
missing items. Also add the QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP
CMake variable that adds the option when configuring projects for
Android.
Change-Id: I1f30ba979f9fb3274e44a53fdc5ebde4e65f0843
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 58343d998c..c7b7f8b70a 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -338,6 +338,10 @@ function(qt6_android_add_apk_target target) COMMENT "Copying ${target} binary to apk folder" ) + set(extra_args "") + if(QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP) + list(APPEND extra_args "--no-rcc-bundle-cleanup") + endif() # The DEPFILE argument to add_custom_command is only available with Ninja or CMake>=3.20 and make. if (CMAKE_GENERATOR MATCHES "Ninja" OR (CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND CMAKE_GENERATOR MATCHES "Makefiles")) @@ -354,6 +358,7 @@ function(qt6_android_add_apk_target target) --apk "${apk_intermediate_file_path}" --depfile "${dep_intermediate_file_path}" --builddir "${CMAKE_BINARY_DIR}" + ${extra_args} COMMENT "Creating APK for ${target}" DEPENDS "${target}" "${deployment_file}" DEPFILE "${dep_intermediate_file_path}") @@ -371,6 +376,7 @@ function(qt6_android_add_apk_target target) --input ${deployment_file} --output ${apk_final_dir} --apk ${apk_final_file_path} + ${extra_args} COMMENT "Creating APK for ${target}" ) endif() |