From a70e9a0162f7814b33af0cfe6d7f67731ba7cce4 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 11 May 2020 15:49:03 +0200 Subject: [android] Allow specifying APK install location 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. Reviewers: #frameworks, #android, apol, vkrause Reviewed By: #android, apol Subscribers: kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D29631 --- toolchain/Android.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'toolchain/Android.cmake') diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 63b40e70..5f1d96f8 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -90,7 +90,8 @@ # make # make create-apk-myapp # -# 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_OUTPUT_DIR``. +# Otherwise the APK can be found in ``myapp_build_apk/`` in the build directory. # # The create-apk-myapp target will be able to take an ARGS parameter with further # arguments for androiddeployqt. For example, one can use:: -- cgit v1.2.1