From eecbbb549e8fbc22d945768df7ed752d9d70de70 Mon Sep 17 00:00:00 2001 From: vigo Date: Mon, 3 Nov 2025 15:53:01 +0100 Subject: [PATCH] Fix GradleMavenReposLinesFromDependencies() for plugins and packages whose "m2repository" isn't a top level folder (a regression introduced in #709). --- source/AndroidResolver/src/GradleTemplateResolver.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/AndroidResolver/src/GradleTemplateResolver.cs b/source/AndroidResolver/src/GradleTemplateResolver.cs index ff9f75e5..9be9d0dd 100644 --- a/source/AndroidResolver/src/GradleTemplateResolver.cs +++ b/source/AndroidResolver/src/GradleTemplateResolver.cs @@ -730,9 +730,12 @@ internal static IList GradleMavenReposLinesFromDependencies( // repo path contains .srcaar. var repoPath = FileUtils.ReplaceBaseAssetsOrPackagesFolder( relativePath, GooglePlayServices.SettingsDialog.LocalMavenRepoDir); - // We also want to just convert any prefixes before a directory/m2repository, since - // they are copied to the LocalMavenRepoDir as well. - repoPath = ReplaceLocalFolderBasedOnM2repo(repoPath); + + if (!repoPath.StartsWith(GooglePlayServices.SettingsDialog.LocalMavenRepoDir)) { + // same replacement logic as in CopySrcAars() + repoPath = ReplaceLocalFolderBasedOnM2repo(repoPath); + } + if (!Directory.Exists(repoPath)) { repoPath = relativePath; }