diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-10 17:11:31 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-11 14:34:14 +0000 |
| commit | 61ddc0685e0edc35b5fc39fdebacf08c64dbc991 (patch) | |
| tree | 875f53f57e84b71040dac323812dc7cfdda85f49 /tests/auto/blackbox/testdata-android/multiple-libs-per-apk | |
| parent | 0934610293ca3e240cf392b99e4b3a9bf1a2570e (diff) | |
Android support: Adapt to changes in newer revisions
Revision 17 dropped some architectures, revision 18 removed GCC.
We also missed some earlier changes to clang-related paths.
Change-Id: Ie2fa1891f7f4de28e18ea6caadce9eac964bb523
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata-android/multiple-libs-per-apk')
| -rw-r--r-- | tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs index 499a5111b..6dd4e6bdb 100644 --- a/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs +++ b/tests/auto/blackbox/testdata-android/multiple-libs-per-apk/multiple-libs-per-apk.qbs @@ -7,6 +7,7 @@ Project { name: "lib1" files: ["src/main/jni/lib1.cpp"] qbs.targetPlatform: "android" + Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" } Android.ndk.appStl: "stlport_shared" cpp.useRPaths: false } @@ -17,6 +18,7 @@ Project { name: "lib2" files: ["src/main/jni/lib2.cpp"] qbs.targetPlatform: "android" + Properties { condition: qbs.toolchain.contains("clang"); Android.ndk.appStl: "c++_shared" } Android.ndk.appStl: "stlport_shared" cpp.useRPaths: false } |