diff options
| author | 2024-09-12 18:14:14 +0000 | |
|---|---|---|
| committer | 2024-09-12 18:14:14 +0000 | |
| commit | 6556d043bdd5ca2009a1aa2daebb400309a6f757 (patch) | |
| tree | 2e36a241dc640f6250bf9dca0b29ba1f5582d827 /java/base.go | |
| parent | 167230037c312acbdef1994702f39091dcffbe0a (diff) | |
| parent | 600afbe381409e77654f73672491492f4c2aeecd (diff) | |
Merge changes from topic "kotlin_kythe" into main
* changes:
Add kotlin kzips to build_kzip.bash
Create .kzip files for kotlin translation units
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/base.go b/java/base.go index ef299b279..ff7e06837 100644 --- a/java/base.go +++ b/java/base.go @@ -535,7 +535,8 @@ type Module struct { linter // list of the xref extraction files - kytheFiles android.Paths + kytheFiles android.Paths + kytheKotlinFiles android.Paths hideApexVariantFromMake bool @@ -1370,7 +1371,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath kotlinJar := android.PathForModuleOut(ctx, "kotlin", jarName) kotlinHeaderJar := android.PathForModuleOut(ctx, "kotlin_headers", jarName) - kotlinCompile(ctx, kotlinJar, kotlinHeaderJar, uniqueSrcFiles, kotlinCommonSrcFiles, srcJars, flags) + j.kotlinCompile(ctx, kotlinJar, kotlinHeaderJar, uniqueSrcFiles, kotlinCommonSrcFiles, srcJars, flags) if ctx.Failed() { return } |