diff options
| author | Matthew Waters <matthew@centricular.com> | 2020-05-14 13:07:26 +1000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-05-14 11:07:48 +0000 |
| commit | bcf29ede06c95f2ee23f3a9994da8a61e1ebaebe (patch) | |
| tree | f296f57b3d084d7fd43cb5576691452d6dad0552 | |
| parent | 37bade6f8760a4e443a8daddbcf6acd4e84b5eab (diff) | |
| download | meson-bcf29ede06c95f2ee23f3a9994da8a61e1ebaebe.zip meson-bcf29ede06c95f2ee23f3a9994da8a61e1ebaebe.tar.gz meson-bcf29ede06c95f2ee23f3a9994da8a61e1ebaebe.tar.bz2 | |
ui/qt: use new directory layout for qt on android
Now follows ios and other platform directory layouts. Moves from
separate android_$arch directories to every library containing a _$arch
suffix. e.g. libQt5Core_x86.a in a single directory.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 4cec814..6e8cae7 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -406,6 +406,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 +429,17 @@ 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' return suffix def _link_with_qtmain(self, is_debug, libdir): |