Skip to content

fix(android): include AGP 9 built-in Kotlin classes in metadata generation #10

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
farfromrefug merged 1 commit into from
Oct 21, 2026
Merged

fix(android): include AGP 9 built-in Kotlin classes in metadata generation #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions vendor/gradle-app/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,6 +1308,12 @@ task buildMetadata(type: BuildToolTask) {
inputs.dir(kotlinClassesDir)
}

// AGP 9 built-in Kotlin no longer writes to tmp/kotlin-classes
def builtInKotlinClassesDir = layout.buildDirectory.dir("intermediates/built_in_kotlinc").get().asFile
if (builtInKotlinClassesDir.exists()) {
inputs.dir(builtInKotlinClassesDir)
}

outputs.files("$METADATA_OUT_PATH/treeNodeStream.dat", "$METADATA_OUT_PATH/treeStringsStream.dat", "$METADATA_OUT_PATH/treeValueStream.dat")

workingDir "$BUILD_TOOLS_PATH"
Expand All @@ -1320,6 +1326,7 @@ task buildMetadata(type: BuildToolTask) {

def classesSubDirs = []
def kotlinClassesSubDirs = []
def builtInKotlinClassesDirs = []
def selectedBuildType = project.ext.selectedBuildType

rootProject.subprojects {
Expand All @@ -1344,6 +1351,17 @@ task buildMetadata(type: BuildToolTask) {
}
}
}

// AGP 9 built-in Kotlin: intermediates/built_in_kotlinc/<buildType>/compile<BuildType>Kotlin/classes
def projectBuiltInKotlinDir = it.layout.buildDirectory.dir("intermediates/built_in_kotlinc/${selectedBuildType}").get().asFile
if (projectBuiltInKotlinDir.exists()) {
for (File taskDir : projectBuiltInKotlinDir.listFiles()) {
def builtInClasses = new File(taskDir, "classes")
if (builtInClasses.exists() && !builtInKotlinClassesDirs.contains(builtInClasses)) {
builtInKotlinClassesDirs.add(builtInClasses)
}
}
}
}

def generatedClasses = new LinkedList<String>()
Expand All @@ -1359,6 +1377,10 @@ task buildMetadata(type: BuildToolTask) {
}
}

for (File builtInClasses : builtInKotlinClassesDirs) {
generatedClasses.add(builtInClasses.getAbsolutePath())
}

def store = new ArrayList<File>()
for (String dir : generatedClasses) {
listf(dir, store)
Expand Down
Loading