From kde-commits  Sat Sep 29 00:40:04 2018
From: Aleix Pol <null () kde ! org>
Date: Sat, 29 Sep 2018 00:40:04 +0000
To: kde-commits
Subject: [extra-cmake-modules] toolchain: Android: Allow passing a relative path as the apk dir
Message-Id: <E1g63Ii-0007P4-Ig () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153851147407441

Git commit 453ba4fee3126648e8ba4cadbef13207e02b1461 by Aleix Pol.
Committed on 29/09/2018 at 00:38.
Pushed by apol into branch 'master'.

Android: Allow passing a relative path as the apk dir

Summary:
This way the project can generate automatically its own manifest file.
GCompris is using it to set the version.

Test Plan: Built GCompris without a warning saying the apkdir isn't found

Reviewers: #frameworks, #gcompris, jjazeix

Reviewed By: #gcompris, jjazeix

Subscribers: jjazeix, kde-frameworks-devel, kde-buildsystem

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D15643

M  +1    -1    toolchain/Android.cmake

https://commits.kde.org/extra-cmake-modules/453ba4fee3126648e8ba4cadbef1320=
7e02b1461

diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index d40463c..74b1dbf 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -203,7 +203,7 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET "cr=
eate-apk")
     foreach(idx RANGE 0 ${last})
         list(GET QTANDROID_EXPORTED_TARGET ${idx} exportedTarget)
         list(GET ANDROID_APK_DIR ${idx} APK_DIR)
-        if(APK_DIR AND NOT EXISTS "${APK_DIR}/AndroidManifest.xml")
+        if(APK_DIR AND NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml"=
 AND IS_ABSOLUTE ANDROID_APK_DIR)
             message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xm=
l according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}")
         elseif(NOT APK_DIR)
             get_filename_component(_qt5Core_install_prefix "${Qt5Core_DIR}=
/../../../" ABSOLUTE)