From b7606eb0d30440dea8f882847efd19c6edb24e07 Mon Sep 17 00:00:00 2001 From: Alex Hochheiden Date: Thu, 22 May 2025 22:05:13 +0000 Subject: [PATCH] Bug 1924743 - Only show lldb-server warning if there are multiple versions installed r=firefox-build-system-reviewers,nalexander Differential Revision: https://phabricator.services.mozilla.com/D250563 --- build/moz.configure/android-ndk.configure | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index 1312b9c9228e..fac4313da344 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -213,14 +213,16 @@ def android_lldb_server(target, host, ndk, lldb): ) sorted_versions = sorted(clang_subdirs, key=Version) highest_version = sorted_versions[-1] - log.warning("Using highest version available: %s" % quote(highest_version)) - log.warning( - " Available versions: " - + ", ".join(str(version) for version in sorted_versions) - ) - log.warning( - "(To use an older version, please specify --with-android-lldb-server=/path/to/desired/android/lldb-server)" - ) + + if len(sorted_versions) > 1: + log.warning("Using highest version available: %s" % quote(highest_version)) + log.warning( + " Available versions: " + + ", ".join(str(version) for version in sorted_versions) + ) + log.warning( + "(To use an older version, please specify --with-android-lldb-server=/path/to/desired/android/lldb-server)" + ) if target.cpu == "x86": target_cpu = "i386"