[android] Allow specifying APK install location
ClosedPublic

Authored by nicolasfella on May 11 2020, 1:22 PM.

Details

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.

Diff Detail

Repository
R240 Extra CMake Modules
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
nicolasfella created this revision.May 11 2020, 1:22 PM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptMay 11 2020, 1:22 PM
Restricted Application added subscribers: kde-buildsystem, kde-frameworks-devel. · View Herald Transcript
nicolasfella requested review of this revision.May 11 2020, 1:22 PM
apol added inline comments.May 11 2020, 1:40 PM
toolchain/Android.cmake
93–94

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.

toolchain/ECMAndroidDeployQt.cmake
85

Needs adapting.

apol added a comment.May 11 2020, 1:41 PM

+1 overall, good idea.

  • Rename variable
nicolasfella marked 2 inline comments as done.May 11 2020, 1:48 PM
apol accepted this revision.May 11 2020, 3:31 PM
This revision is now accepted and ready to land.May 11 2020, 3:31 PM
This revision was automatically updated to reflect the committed changes.