979a21dc4e
Right now, "multi abi builds" of android projects works only if the
android-build installation doesn't use custom install dirs
(INSTALL_PREFIX, INSTALL_BINDIR...)
At the same time, it fixes QTBUG-106533. The patches are the same as the
ones in that bugreport.
Add new items to android-*-deployment-settings.json:
qtDataDirectory
qtLibsDirectory
qtLibExecsDirectory
qtPluginsDirectory
qtQmlDirectory
Update androiddeployqt to be able to get files from their install location
BTW (fixes QTBUG-106533):
Install src/android/templates into INSTALL_DATADIR
Install src/3rdparty/gradle into INSTALL_DATADIR
Install src/android/java files into INSTALL_DATADIR
Install all jars into INSTALL_DATADIR
Add missing path to target_qt.conf
Update target_qt.conf to have all path. Otherwise qmake wouldn't have
the path when installing the android-build with custom install dirs
like INSTALL_LIBDIR & friends
Add support for a new cmake variable that can be set at build time of the
android projects: QT_ANDROID_PATH_CMAKE_DIR_${abi} (Name chosen as
brother of QT_HOST_PATH_CMAKE_DIR)
Pick-to: 6.5
Fixes: QTBUG-106533
Fixes: QTBUG-107207
Change-Id: Ia3751362ab1b5f877ecafbe02f263feac167119c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||
|---|---|---|
| .. | ||
| aix-g++ | ||
| aix-g++-64 | ||
| android-clang | ||
| common | ||
| cygwin-g++ | ||
| darwin-g++ | ||
| devices | ||
| dummy | ||
| features | ||
| freebsd-clang | ||
| freebsd-g++ | ||
| haiku-g++ | ||
| hpuxi-g++-64 | ||
| hurd-g++ | ||
| integrity-armv7 | ||
| integrity-armv7-imx6 | ||
| integrity-armv8-rcar | ||
| integrity-x86 | ||
| linux-aarch64-gnu-g++ | ||
| linux-arm-gnueabi-g++ | ||
| linux-clang | ||
| linux-clang-32 | ||
| linux-clang-libc++ | ||
| linux-clang-libc++-32 | ||
| linux-g++ | ||
| linux-g++-32 | ||
| linux-g++-64 | ||
| linux-icc | ||
| linux-icc-32 | ||
| linux-icc-64 | ||
| linux-icc-k1om | ||
| linux-llvm | ||
| linux-lsb-g++ | ||
| lynxos-g++ | ||
| macx-clang | ||
| macx-g++ | ||
| macx-icc | ||
| macx-ios-clang | ||
| macx-xcode | ||
| modules | ||
| netbsd-g++ | ||
| openbsd-g++ | ||
| qnx-aarch64le-qcc | ||
| qnx-armle-v7-qcc | ||
| qnx-x86-64-qcc | ||
| qnx-x86-qcc | ||
| solaris-cc | ||
| solaris-cc-64 | ||
| solaris-cc-64-stlport | ||
| solaris-cc-stlport | ||
| solaris-g++ | ||
| solaris-g++-64 | ||
| unsupported | ||
| wasm-emscripten | ||
| wasm-emscripten-64 | ||
| win32-arm64-msvc | ||
| win32-clang-g++ | ||
| win32-clang-msvc | ||
| win32-g++ | ||
| win32-icc | ||
| win32-icc-k1om | ||
| win32-msvc | ||