diff options
| -rw-r--r-- | tests/auto/blackbox/find/find-android.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/blackbox/find/find-android.qbs b/tests/auto/blackbox/find/find-android.qbs index e164d6863..5a28b0560 100644 --- a/tests/auto/blackbox/find/find-android.qbs +++ b/tests/auto/blackbox/find/find-android.qbs @@ -27,6 +27,8 @@ Product { tools["ndk"] = product.moduleProperty("Android.ndk", "ndkDir"); tools["ndk-samples"] = product.Android.ndk.ndkSamplesDir; } + if (product.java && product.java.present) + tools["jar"] = product.java.jarFilePath; var tf; try { diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index b47894234..7ad008bdf 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -60,6 +60,7 @@ QMap<QString, QString> TestBlackboxAndroid::findAndroid(int *status, const QStri {"sdk-build-tools-dx", QDir::fromNativeSeparators(tools["sdk-build-tools-dx"].toString())}, {"ndk", QDir::fromNativeSeparators(tools["ndk"].toString())}, {"ndk-samples", QDir::fromNativeSeparators(tools["ndk-samples"].toString())}, + {"jar", QDir::fromNativeSeparators(tools["jar"].toString())}, }; } @@ -109,7 +110,7 @@ void TestBlackboxAndroid::android() const QString apkFilePath = relativeProductBuildDir(productName, configName) + '/' + productName + ".apk"; QVERIFY2(regularFileExists(apkFilePath), qPrintable(apkFilePath)); - const QString jarFilePath = findExecutable(QStringList("jar")); + const QString jarFilePath = androidPaths["jar"]; QVERIFY(!jarFilePath.isEmpty()); QProcess jar; jar.start(jarFilePath, QStringList() << "-tf" << apkFilePath); |