Uploaded image for project: 'Qt'
  1. Qt
  2. QTBUG-107207

Add support for MultiABI with custom install dir of the android-build (patch included)

    XMLWordPrintable

Details

    • 979a21dc4 (dev), 474ad27c6 (6.5)

    Description

      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...)

      Please find attached 2 patches that will add support for this.

      At the same time, it fixes QTBUG-106533. The patches are the same as the ones in that bugreport.

      Building with these patches applied to 6.4.0 is successful and building an android project works with both qmake and cmake (single abi and multi abi). The resulting APK runs fine on a real android device and APK.

      The patches:

      • Add new items to android-*-deployment-settings.json:
      • qtDataDirectory
      • qtLibsDirectory
      • qtLibExecsDirectory
      • qtPluginsDirectory
      • qtQmlDirectory
      • When configuring with cmake, also set the qml-importscanner-binary
        attribute in android-*-deployment-settings.json. It was missing when using cmake (qmake builds had it already)
      • 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_PATH_CMAKE_DIR_ANDROID_ABI_${abi} (Name chosen as brother of QT_HOST_PATH_CMAKE_DIR)

      Attachments

        For Gerrit Dashboard: QTBUG-107207
        # Subject Branch Project Status CR V

        Activity

          People

            qtbuildsystem Qt Build System Team
            ban F S
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Gerrit Reviews

                There are no open Gerrit changes