summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-02-06 17:04:16 -0800
committerJake Petroules <jake.petroules@qt.io>2017-02-07 01:20:15 +0000
commit2cefa5b0fd5179cbcb2ff05b528f835373e6be52 (patch)
tree5b44fc11a11a3f12c07490bf8b22766e2539ee25
parent4aae6cc0dd1475b54b1fd9149fec6269f092537c (diff)
Let Android build work in single-architecture modeHEADmaster
Change-Id: I20eff8e3f7f9b188a36bbf2f8434fe9a02a2c5f8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-rw-r--r--plugin/plugin.qbs2
-rw-r--r--ui/ui.qbs2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/plugin.qbs b/plugin/plugin.qbs
index 98f980c..614731b 100644
--- a/plugin/plugin.qbs
+++ b/plugin/plugin.qbs
@@ -16,7 +16,7 @@ QtGuiApplication {
Properties {
condition: qbs.targetOS.contains("android")
- architectures: ["x86", "armv7"]
+ architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
Android.ndk.appStl: "gnustl_shared"
}
diff --git a/ui/ui.qbs b/ui/ui.qbs
index 2ba0284..43eaa22 100644
--- a/ui/ui.qbs
+++ b/ui/ui.qbs
@@ -29,7 +29,7 @@ Project {
Properties {
condition: qbs.targetOS.contains("android")
- architectures: ["x86", "armv7"]
+ architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
Android.ndk.appStl: "gnustl_shared"
}