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/tst_blackboxandroid.cpp | |
| 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/tst_blackboxandroid.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 7ad008bdf..c0ffa5620 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -179,6 +179,10 @@ void TestBlackboxAndroid::android_data() .replace("armv5te", "armeabi") .replace("arm64", "arm64-v8a"); }); + const bool usesClang = p.value(QLatin1String("qbs.toolchainType")).toString() == "clang"; + const auto cxxLibPath = [usesClang](const QByteArray &oldcxxLib) { + return "lib/${ARCH}/" + (usesClang ? "libc++_shared.so" : oldcxxLib); + }; auto expandArchs = [] (const QByteArrayList &archs, const QByteArrayList &lst) { const QByteArray &archPlaceHolder = "${ARCH}"; @@ -208,7 +212,7 @@ void TestBlackboxAndroid::android_data() "assets/Shaders/ShaderPlain.fsh", "assets/Shaders/VS_ShaderPlain.vsh", "lib/${ARCH}/gdbserver", - "lib/${ARCH}/libgnustl_shared.so", + cxxLibPath("libgnustl_shared.so"), "lib/${ARCH}/libTeapotNativeActivity.so", "res/layout/widgets.xml"})); QTest::newRow("no native") @@ -238,21 +242,21 @@ void TestBlackboxAndroid::android_data() "lib/${ARCH}/gdbserver", "lib/${ARCH}/liblib1.so", "lib/${ARCH}/liblib2.so", - "lib/${ARCH}/libstlport_shared.so"})); + cxxLibPath("libstlport_shared.so")})); QByteArrayList expectedFiles1 = (commonFiles - + expandArchs(QByteArrayList{"mips", "x86"}, { + + expandArchs(QByteArrayList{"armeabi-v7a", "x86"}, { "lib/${ARCH}/gdbserver", "lib/${ARCH}/libp1lib1.so", - "lib/${ARCH}/libstlport_shared.so"}) + cxxLibPath("libstlport_shared.so")}) + expandArchs(QByteArrayList{archs}, { "lib/${ARCH}/gdbserver", "lib/${ARCH}/libp1lib2.so", - "lib/${ARCH}/libstlport_shared.so"})).toSet().toList(); + cxxLibPath("libstlport_shared.so")})).toSet().toList(); QByteArrayList expectedFiles2 = commonFiles + expandArchs(archs, { "lib/${ARCH}/gdbserver", "lib/${ARCH}/libp2lib1.so", "lib/${ARCH}/libp2lib2.so", - "lib/${ARCH}/libstlport_shared.so"}); + cxxLibPath("libstlport_shared.so")}); expectedFiles2.removeOne("resources.arsc"); QTest::newRow("multiple apks") << "multiple-apks-per-project" |