Including JdkImageWorkaround in newer versions #419
Conversation
src/main/groovy/org/gradle/android/workarounds/JdkImageWorkaround.groovy
Outdated
Show resolved
Hide resolved
src/main/groovy/org/gradle/android/workarounds/JdkImageWorkaround.groovy
Outdated
Show resolved
Hide resolved
| jdkTransform(project, task) | ||
| } | ||
| } else { | ||
| project.afterEvaluate { |
There was a problem hiding this comment.
why do we need afterEvaluate here?
There was a problem hiding this comment.
here correct me if I'm wrong, but my approach was based in:
because the variant.javaCompilerProvider is unavailable, I need to check if a compiler argument is defined for jdkImage. When I'm configuring the project, the AGP didn't create the compiler argument yet. That's the main reason. Ideas/suggestions?
| if (jdkImageInput != null) { | ||
| setupExtractedJdkImageInputTransform(project, getJvmHome(task)) | ||
| replaceCommandLineProvider(task, jdkImageInput) | ||
| if (Versions.CURRENT_ANDROID_VERSION <= VersionNumber.parse("7.4.0-alpha01")) { |
There was a problem hiding this comment.
is there a newer replacement for variant.javaCompileProvider in 7.4 + ?
There was a problem hiding this comment.
There was a problem hiding this comment.
Can we do something like variant.javaCompilation like we do in the RoomWorkaround?
There was a problem hiding this comment.
tried yesterday and same issue, at the time the variant is being processed we don't have agp jdkImageInput required to apply the workaround.
There was a problem hiding this comment.
to extend the previous comment, in the previous AGP variant you have access to the Task Provider of Java task, because is lazy we can guarantee that the required ap options have been configured.
The new variant removes this functionality, in the case of the RoomWorkaround we don't require to have existing ap options because we are just inserting new argument provider in the variant block.
There was a problem hiding this comment.
@runningcode, following Xavier's comments, there is no replacement for variant.javaCompileProvider but we can still use the old API before is removed in AGP 9.
I created new commit using the old API fa66728 and worked
There was a problem hiding this comment.
That sounds good. Thanks for getting Xav's feedback there.
| setupExtractedJdkImageInputTransform(project, getJvmHome(task)) | ||
| replaceCommandLineProvider(task, jdkImageInput) | ||
| } | ||
| jdkTransform(project, task) |
There was a problem hiding this comment.
can we keep the code exactly as before to minimize the diff?
This PR includes the
JdkImageWorkaroundin AGP >= 7.4 versions again.Context
After issue #416 we investigated the state of the cache miss for Java compilation in recent AGP 7.4. The complete investigation is here #416 (comment)
The investigation was based on a scenario with two different java versions: Temurin 11 latest and Zulu 11 latest.
Today, we extended the reproducible project with Zulu 11.0.9+1 with the following results:
Sadly we observed cache misses using the Java version Zulu 11.0.9+1.
Additionally, we observed same issue on local builds using an M1 with Java versions: liberica-11.0.15+10 and liberica-11.0.15.1+2: https://ge.solutions-team.gradle.com/c/mefzwvhujyq4y/fgdorbiinpkfw/task-inputs
The main issue is that the output difference is non-deterministic. With some Java combinations, the issue can be fixed by applying normalization(#416 (comment)), but in others, we need to apply the workaround.
Implementation
We removed the annotation property
fixedin the workaround. To make it work with AGP 7.4 we had to:variant.javaCompileProvideris not available in the new variant API. Instead of that, we configure theJavaCompiletaskandroid.baseplugin.java/lang/invokepackage. I includedit.ignore '**/java/lang/invoke/**'in the workaround normalization. I will check with the team.Results
M1 Local build using liberica-11.0.15+10 and liberica-11.0.15.1+2 --> https://ge.solutions-team.gradle.com/c/7g6lcqlsv6qje/lbdwlkkg4iyyg/task-inputs