From f73687d64d49ba9b291910c75bd1ddf6379d257d Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 14 May 2020 13:07:26 +1000 Subject: [PATCH] ui/qt: use new directory layout for qt on android --- mesonbuild/dependencies/ui.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 4cec814..cdb517c 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -18,6 +18,7 @@ import os import re import subprocess import typing as T +import textwrap from collections import OrderedDict from .. import mlog @@ -406,6 +407,9 @@ class QtBaseDependency(ExternalDependency): if libfile: libfile = libfile[0] else: + mlog.log("Could not find:", module, + self.qtpkgname + module + modules_lib_suffix, + 'in', libdir) self.is_found = False break self.link_args.append(libfile) @@ -426,6 +430,20 @@ class QtBaseDependency(ExternalDependency): if self.env.machines[self.for_machine].is_darwin(): if is_debug: suffix += '_debug' + if mesonlib.version_compare(self.version, '>= 5.14.0'): + if self.env.machines[self.for_machine].is_android(): + cpu_family = self.env.machines[self.for_machine].cpu_family + if cpu_family == 'x86': + suffix += '_x86' + elif cpu_family == 'x86_64': + suffix += '_x86_64' + elif cpu_family == 'arm': + suffix += '_armeabi-v7a' + elif cpu_family == 'aarch64': + suffix += '_arm64-v8a' + else: + mlog.warning(textwrap.dedent('''cpu_family {} is not known + to be available with Qt {} on Android'''.format(cpu_family, self.version))) return suffix def _link_with_qtmain(self, is_debug, libdir): -- 2.26.2