Android: Multiplex over architectures instead of profiles

The extra per-architecture profiles are gone now.

Change-Id: I78017d0840f46ee3654dadc4cf9402c63bfc7883
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 1 insertions, 8 deletions

diff --git a/tests/auto/blackbox/testdata-java/android/multiple-apks-per-project/product1/product1.qbs b/tests/auto/blackbox/testdata-java/android/multiple-apks-per-project/product1/product1.qbs
index 721b292e3..0ddd7526c 100644
--- a/tests/auto/blackbox/testdata-java/android/multiple-apks-per-project/product1/product1.qbs
+++ b/tests/auto/blackbox/testdata-java/android/multiple-apks-per-project/product1/product1.qbs
@@ -7,7 +7,7 @@ Project {
         name: "p1lib1"
         files: ["src/main/jni/lib1.cpp"]
         Android.ndk.appStl: "stlport_shared"
-        architectures: !qbs.architecture ? ["mips", "x86"] : undefined
+        qbs.architectures: !qbs.architecture ? ["mips", "x86"] : undefined
         cpp.useRPaths: false
     }
 
diff --git a/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs b/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs
index 337d3eb77..dbacef92d 100644
--- a/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs
+++ b/tests/auto/blackbox/testdata-java/android/teapot/teapot.qbs
@@ -2,11 +2,7 @@ import qbs
 
 Project {
     minimumQbsVersion: qbs.version
-    property stringList architectures: !qbs.architecture
-                                       ? ["arm64", "armv7a", "x86", "x86_64", "mips", "mips64"]
-                                       : undefined
     StaticLibrary {
-        architectures: project.architectures
         name: "native-glue"
         Depends { name: "cpp" }
         Group {
@@ -23,7 +19,6 @@ Project {
     }
 
     StaticLibrary {
-        architectures: project.architectures
         name: "ndk-helper"
         Depends { name: "Android.ndk" }
         Depends { name: "cpp" }
@@ -44,7 +39,6 @@ Project {
     }
 
     StaticLibrary {
-        architectures: project.architectures
         name: "cpufeatures"
         Depends { name: "cpp" }
         Group {
@@ -62,7 +56,6 @@ Project {
 
     DynamicLibrary {
         name: "TeapotNativeActivity"
-        architectures: project.architectures
         Depends { name: "Android.ndk" }
         Depends { name: "cpp" }
         Depends { name: "cpufeatures" }