Android: Skip tools built for target architecture

Android apps require packaging to be usable, so they need to be
built individually, not as part of the subdirs build. The build would
fail during make install due to this.

Task-number: QTBUG-34023
Change-Id: Id68f5fbdd4eeb6f130d20a0f4b831c6c24639471
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

diff --git a/tools/tools.pro b/tools/tools.pro
index 168746e..2dab801 100644 (file)
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,12 +1,13 @@
 TEMPLATE = subdirs
-qtHaveModule(quick): SUBDIRS += qmlscene qmlplugindump
-qtHaveModule(qmltest): SUBDIRS += qmltestrunner
+qtHaveModule(quick): !android|android_app: SUBDIRS += qmlscene qmlplugindump
+qtHaveModule(qmltest): !android|android_app: SUBDIRS += qmltestrunner
 SUBDIRS += \
-    qml \
     qmlmin \
-    qmlprofiler \
-    qmlbundle \
-    v4
+    qmlprofiler
+!android|android_app: SUBDIRS += \
+                          qml \
+                          qmlbundle \
+                          v4
 qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing
 qtHaveModule(quick): SUBDIRS += qmlimportscanner