From 3c80f1bd9dc6310fa7afa92ccb23fc77523e6bb3 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 23 Feb 2021 10:30:38 +0100 Subject: [PATCH] Android: Add 3rdparty jars to classpaths Change-Id: Ibc645e2377d4cb6d5eddd86d77cbb7f8ca294f1f Reviewed-by: Christian Stenger --- src/plugins/android/javalanguageserver.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp index a329057ab32..8c5abcca3e5 100644 --- a/src/plugins/android/javalanguageserver.cpp +++ b/src/plugins/android/javalanguageserver.cpp @@ -299,9 +299,9 @@ void JLSClient::updateProjectFiles() const FilePath &projectDir = project()->rootProjectDirectory(); if (!projectDir.exists()) return; - FilePath sourceDir = FilePath::fromVariant( + const FilePath packageSourceDir = FilePath::fromVariant( node->data(Constants::AndroidPackageSourceDir)); - sourceDir = sourceDir.pathAppended("src"); + FilePath sourceDir = packageSourceDir.pathAppended("src"); if (!sourceDir.exists()) return; sourceDir = sourceDir.relativeChildPath(projectDir); @@ -309,7 +309,10 @@ void JLSClient::updateProjectFiles() const QString &targetSDK = AndroidManager::buildTargetSDK(m_currentTarget); const QString androidJar = QString("%1/platforms/%2/android.jar") .arg(sdkLocation.toString(), targetSDK); - const QStringList libs(androidJar); + QStringList libs(androidJar); + QDir libDir(packageSourceDir.pathAppended("libs").toString()); + libs << Utils::transform(libDir.entryInfoList({"*.jar"}, QDir::Files), + &QFileInfo::absoluteFilePath); generateClassPathFile(projectDir, sourceDir.toString(), libs); generateProjectFile(projectDir, project()->displayName()); }