StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix .kotlin_builtins glob

Browse Source 
The files in kotlin jars seem to be called .kotlin_builtins, not
.kotlin_builtin.

Test: m checkbuild
Change-Id: I541aea758bbef6bb23632836cceb8339b82ffdff
This commit is contained in:
Colin Cross
2018-07-13 21:23:59 -07:00
parent 4c03f68763
commit 29788aad61
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -1034,7 +1034,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
// TODO(pszczepaniak): Support kotlin-reflect // TODO(pszczepaniak): Support kotlin-reflect
stripFiles = append(stripFiles, stripFiles = append(stripFiles,
"**/*.kotlin_module", "**/*.kotlin_module",
"**/*.kotlin_builtin") "**/*.kotlin_builtins")
} else { } else {
// Only add kotlin-stdlib if not using (on-device) renamed stdlib // Only add kotlin-stdlib if not using (on-device) renamed stdlib
// (it's expected to be on device bootclasspath) // (it's expected to be on device bootclasspath)