From a30cc31e8c50701ecf3a9bbba658c314f46ec02b Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 10 Mar 2025 17:27:48 +0100 Subject: [PATCH] [androidtestrunner] Add early return if AndroidManifest.xml is missing Helps to debug deployment issues. Change-Id: I15909b3ce9e680636e87ec8764bacbd75711e857 Reviewed-by: Assam Boudjelthia (cherry picked from commit 2c8872f3815853b3bdefde30f09acd4389933744) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit c971288a041529d263870b1cbe8d121e35f064c4) --- src/tools/androidtestrunner/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index 1b3f3349bfc..ea6b5cdfeea 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -857,6 +857,10 @@ int main(int argc, char *argv[]) g_testInfo.userId = userId(); QString manifest = g_options.buildPath + "/AndroidManifest.xml"_L1; + if (!QFile::exists(manifest)) { + qCritical("Unable to find '%s'.", qPrintable(manifest)); + return EXIT_ERROR; + } g_options.package = packageNameFromAndroidManifest(manifest); if (g_options.activity.isEmpty()) g_options.activity = activityFromAndroidManifest(manifest);