feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Add 3rdparty jars to classpaths

Browse Source 
Change-Id: Ibc645e2377d4cb6d5eddd86d77cbb7f8ca294f1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-02-23 10:30:38 +01:00
parent d46d53de1f
commit 3c80f1bd9d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/javalanguageserver.cpp
View File

@@ -299,9 +299,9 @@ void JLSClient::updateProjectFiles()
const FilePath &projectDir = project()->rootProjectDirectory(); const FilePath &projectDir = project()->rootProjectDirectory();
if (!projectDir.exists()) if (!projectDir.exists())
return; return;
FilePath sourceDir = FilePath::fromVariant( const FilePath packageSourceDir = FilePath::fromVariant(
node->data(Constants::AndroidPackageSourceDir)); node->data(Constants::AndroidPackageSourceDir));
sourceDir = sourceDir.pathAppended("src"); FilePath sourceDir = packageSourceDir.pathAppended("src");
if (!sourceDir.exists()) if (!sourceDir.exists())
return; return;
sourceDir = sourceDir.relativeChildPath(projectDir); sourceDir = sourceDir.relativeChildPath(projectDir);
@@ -309,7 +309,10 @@ void JLSClient::updateProjectFiles()
const QString &targetSDK = AndroidManager::buildTargetSDK(m_currentTarget); const QString &targetSDK = AndroidManager::buildTargetSDK(m_currentTarget);
const QString androidJar = QString("%1/platforms/%2/android.jar") const QString androidJar = QString("%1/platforms/%2/android.jar")
.arg(sdkLocation.toString(), targetSDK); .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); generateClassPathFile(projectDir, sourceDir.toString(), libs);
generateProjectFile(projectDir, project()->displayName()); generateProjectFile(projectDir, project()->displayName());
} }