diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-16 15:14:18 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-04 14:56:05 +0000 |
| commit | 1ce4105a7d3207410c9be8d202464e6f2b2c6861 (patch) | |
| tree | c468e3967fe53c49ddb8b5edb5dc2ba21d89c86f /tests/auto/blackbox/tst_blackboxandroid.cpp | |
| parent | bb27df0890e22979706455bd756e33d2bdf17240 (diff) | |
| download | qbs-1ce4105a7d3207410c9be8d202464e6f2b2c6861.tar.gz | |
Android: Rewrite the rules gathering binaries for packaging
These rules were unnecessarily complicated; in particular, the
indirection via a text file for the gdbserver and STL binaries was not
needed.
This also fixed the gdbserver file name in the package: It has to be
libgdbserver.so, rather than just gdbserver as on the host.
Change-Id: I2315660983904e8b922164be9054d6bba51f852d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxandroid.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index b4c431902..d0cf37741 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -124,7 +124,7 @@ void TestBlackboxAndroid::android() QByteArrayList missingExpectedFiles; QByteArrayList expectedFiles = currentExpectedFilesLists.takeFirst(); for (const QByteArray &expectedFile : expectedFiles) { - if (expectedFile.endsWith("/gdbserver") && configName == "release") + if (expectedFile.endsWith("/libgdbserver.so") && configName == "release") continue; auto it = std::find(actualFiles.begin(), actualFiles.end(), expectedFile); if (it != actualFiles.end()) { @@ -209,7 +209,7 @@ void TestBlackboxAndroid::android_data() "resources.arsc", "assets/Shaders/ShaderPlain.fsh", "assets/Shaders/VS_ShaderPlain.vsh", - "lib/${ARCH}/gdbserver", + "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/libgnustl_shared.so", "lib/${ARCH}/libTeapotNativeActivity.so", "res/layout/widgets.xml"})); @@ -241,28 +241,26 @@ void TestBlackboxAndroid::android_data() << QStringList("twolibs") << (QList<QByteArrayList>() << commonFiles + expandArchs(archs, { "resources.arsc", - "lib/${ARCH}/gdbserver", + "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/liblib1.so", "lib/${ARCH}/liblib2.so", "lib/${ARCH}/libstlport_shared.so"})); QByteArrayList expectedFiles1 = (commonFiles + expandArchs(QByteArrayList{"mips", "x86"}, { "resources.arsc", - "lib/${ARCH}/gdbserver", + "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/libp1lib1.so", "lib/${ARCH}/libstlport_shared.so"}) + expandArchs(QByteArrayList{archs}, { "resources.arsc", - "lib/${ARCH}/gdbserver", + "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/libp1lib2.so", "lib/${ARCH}/libstlport_shared.so"})).toSet().toList(); QByteArrayList expectedFiles2 = commonFiles + expandArchs(archs, { - "resources.arsc", - "lib/${ARCH}/gdbserver", + "lib/${ARCH}/libgdbserver.so", "lib/${ARCH}/libp2lib1.so", "lib/${ARCH}/libp2lib2.so", "lib/${ARCH}/libstlport_shared.so"}); - expectedFiles2.removeOne("resources.arsc"); QTest::newRow("multiple apks") << "multiple-apks-per-project" << (QStringList() << "twolibs1" << "twolibs2") |