D29631: [android] Allow specifying APK install location
This revision was automatically updated to reflect the committed changes. Closed by commit R240:a70e9a0162f7: [android] Allow specifying APK install location (authored by nicolasfella). REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D29631?vs=82531=82569 REVISION DETAIL https://phabricator.kde.org/D29631 AFFECTED FILES toolchain/Android.cmake toolchain/ECMAndroidDeployQt.cmake To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
apol accepted this revision. This revision is now accepted and ready to land. REPOSITORY R240 Extra CMake Modules BRANCH androinstall REVISION DETAIL https://phabricator.kde.org/D29631 To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
nicolasfella updated this revision to Diff 82531. nicolasfella added a comment. - Rename variable REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D29631?vs=82527=82531 BRANCH androinstall REVISION DETAIL https://phabricator.kde.org/D29631 AFFECTED FILES toolchain/Android.cmake toolchain/ECMAndroidDeployQt.cmake To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
nicolasfella marked 2 inline comments as done. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D29631 To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
apol added a comment. +1 overall, good idea. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D29631 To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
apol added inline comments.
INLINE COMMENTS
> Android.cmake:93
> #
> -# The APK would then be found in ``myapp_build_apk/bin`` in the build
> directory.
> +# You can specify the APK output directory by setting
> ANDROID_APK_INSTALL_DIR.
> +# Otherwise the APK can be found in ``myapp_build_apk/`` in the build
> directory.
ANDROID_APK_INSTALL_DIR should be between quotes like other variables.
Also I'd call the variable ANDROID_APK_OUTPUT_DIR. We have an install concept
already.
> ECMAndroidDeployQt.cmake:85
> add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET}
> COMMAND adb install -r
> "${EXPORT_DIR}/${QTANDROID_EXPORTED_TARGET}-${CMAKE_ANDROID_ARCH_ABI}.apk"
> )
Needs adapting.
REPOSITORY
R240 Extra CMake Modules
REVISION DETAIL
https://phabricator.kde.org/D29631
To: nicolasfella, #frameworks, #android, apol, vkrause
Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy,
michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
nicolasfella added a comment. This is used in https://invent.kde.org/sysadmin/ci-tooling/-/merge_requests/68 REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D29631 To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
D29631: [android] Allow specifying APK install location
nicolasfella created this revision. nicolasfella added reviewers: Frameworks, Android, apol, vkrause. Herald added projects: Frameworks, Build System. Herald added subscribers: kde-buildsystem, kde-frameworks-devel. nicolasfella requested review of this revision. REVISION SUMMARY This allows `make create-apk` to directly write the APK to /output instead of the cp-with-prefix step in /opt/helpers/create-apk. It's also useful for manual development builds where one would need to copy it to some output location manually or for CI setups that expect the output in a certain location. If ANDROID_APK_INSTALL_DIR is not set the current behaviour is kept. REPOSITORY R240 Extra CMake Modules BRANCH androinstall REVISION DETAIL https://phabricator.kde.org/D29631 AFFECTED FILES toolchain/Android.cmake toolchain/ECMAndroidDeployQt.cmake To: nicolasfella, #frameworks, #android, apol, vkrause Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, cblack, bencreasy, michaelh, ngraham, bruns
