Skip to content

Android: pass compileMvnDeps as classpaths to R8 #5887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2025
+17 −0
Merged

Android: pass compileMvnDeps as classpaths to R8 #5887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4461c7e
pass `compileMvnDeps` as classpaths to R8
souvlakias Sep 18, 2025
e6e8cbe
do not pass if `androidResolvedCompileMvnDeps` is empty
souvlakias Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libs/androidlib/src/mill/androidlib/AndroidModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,10 @@ trait AndroidModule extends JavaModule { outer =>
transformedAndroidDeps(Task.Anon(resolvedMvnDeps()))()
}

def androidResolvedCompileMvnDeps: T[Seq[PathRef]] = Task {
defaultResolver().classpath(compileMvnDeps())
}

protected def transformedAndroidDeps(resolvedDeps: Task[Seq[PathRef]]): Task[Seq[PathRef]] =
Task.Anon {
val transformedAarFilesToJar: Seq[PathRef] =
Expand Down
13 changes: 13 additions & 0 deletions libs/androidlib/src/mill/androidlib/AndroidR8AppModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,19 @@ trait AndroidR8AppModule extends AndroidAppModule {

r8ArgsBuilder ++= pgArgs

val resolvedCompileMvnDeps = androidResolvedCompileMvnDeps()
if (!resolvedCompileMvnDeps.isEmpty) {
val compiledMvnDepsFile = Task.dest / "compiled-mvndeps.txt"
os.write.over(
compiledMvnDepsFile,
androidResolvedCompileMvnDeps().map(_.path.toString()).mkString("\n")
)
r8ArgsBuilder ++= Seq(
"--classpath",
"@" + compiledMvnDepsFile.toString
)
}

r8ArgsBuilder ++= androidR8Args()

r8ArgsBuilder += "@" + allClassFilesFile.toString
Expand Down
Loading