diff options
| author | 2019-01-17 15:42:52 -0800 | |
|---|---|---|
| committer | 2019-01-22 21:47:19 +0000 | |
| commit | afbb1734f6fe8073885961578e9312e16826a2e8 (patch) | |
| tree | 1cb607eccd00db64b72aa306c7b1649d25457c31 /java/builder.go | |
| parent | 21fc9bbe198caf9736bb9dc0f5701e8bfd56de40 (diff) | |
Pass annotation processors to kotlinc
Enable the kotlin-annotation-processing plugin and pass annotation
processors to it.
Bug: 122251693
Test: m checkbuild
Test: TestKapt in kotlin_test.go
Change-Id: I841df454beaaa7edd263eea714ca0d958a03c9de
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/builder.go b/java/builder.go index f1a6ead02..40f72e107 100644 --- a/java/builder.go +++ b/java/builder.go @@ -200,7 +200,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. // ensure java does not fall back to the default bootclasspath. bootClasspath = `--bootclasspath ""` } else { - bootClasspath = strings.Join(flags.bootClasspath.FormTurbineClasspath("--bootclasspath"), " ") + bootClasspath = strings.Join(flags.bootClasspath.FormTurbineClasspath("--bootclasspath "), " ") } ctx.Build(pctx, android.BuildParams{ @@ -213,7 +213,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. "javacFlags": flags.javacFlags, "bootClasspath": bootClasspath, "srcJars": strings.Join(srcJars.Strings(), " "), - "classpath": strings.Join(flags.classpath.FormTurbineClasspath("--classpath"), " "), + "classpath": strings.Join(flags.classpath.FormTurbineClasspath("--classpath "), " "), "outDir": android.PathForModuleOut(ctx, "turbine", "classes").String(), "javaVersion": flags.javaVersion, }, @@ -415,7 +415,7 @@ func (x *classpath) FormTurbineClasspath(optName string) []string { } flags := make([]string, len(*x)) for i, v := range *x { - flags[i] = optName + " " + v.String() + flags[i] = optName + v.String() } return flags |