diff options
| author | 2018-06-19 22:43:34 -0700 | |
|---|---|---|
| committer | 2018-06-20 21:03:07 -0700 | |
| commit | 6a77c9871c5e16cbbbf0ece76d3ae0b400b74a39 (patch) | |
| tree | e38181554e21c8b805c68b5e9dfb8a8edcbe5d7b /java/builder.go | |
| parent | ab97ae08cd60bae555c0689aed7c182f2e97864b (diff) | |
Use -processorpath for annotation processors
ErrorProne needs to be added to -processorpath, but once anything is
passed via -processorpath javac stops looking in the classpath for
annotation processors. Move annotation processors to -processorpath
in preparation.
This reapplies Ife06b3c7432ab971f5605dcc18a558bcbd99a675 with fixes
to processorpath in errorprone rules.
Test: m java
Change-Id: I188136771386a2183fb31f4b70b50c95ac419ff8
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/builder.go b/java/builder.go index d338623dc..2a2ed23f1 100644 --- a/java/builder.go +++ b/java/builder.go @@ -43,7 +43,7 @@ var ( Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ${config.JavacHeapFlags} ${config.CommonJdkFlags} ` + - `$javacFlags $bootClasspath $classpath ` + + `$processorpath $javacFlags $bootClasspath $classpath ` + `-source $javaVersion -target $javaVersion ` + `-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list && ` + `${config.SoongZipCmd} -jar -o $out -C $outDir -D $outDir`, @@ -56,7 +56,7 @@ var ( Rspfile: "$out.rsp", RspfileContent: "$in", }, - "javacFlags", "bootClasspath", "classpath", "srcJars", "srcJarDir", + "javacFlags", "bootClasspath", "classpath", "processorpath", "srcJars", "srcJarDir", "outDir", "annoDir", "javaVersion") kotlinc = pctx.AndroidGomaStaticRule("kotlinc", @@ -85,7 +85,7 @@ var ( Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.SoongJavacWrapper} ${config.ErrorProneCmd} ` + - `$javacFlags $bootClasspath $classpath ` + + `$processorpath $javacFlags $bootClasspath $classpath ` + `-source $javaVersion -target $javaVersion ` + `-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list && ` + `${config.SoongZipCmd} -jar -o $out -C $outDir -D $outDir`, @@ -100,7 +100,7 @@ var ( Rspfile: "$out.rsp", RspfileContent: "$in", }, - "javacFlags", "bootClasspath", "classpath", "srcJars", "srcJarDir", + "javacFlags", "bootClasspath", "classpath", "processorpath", "srcJars", "srcJarDir", "outDir", "annoDir", "javaVersion") turbine = pctx.AndroidStaticRule("turbine", @@ -155,6 +155,7 @@ type javaBuilderFlags struct { javacFlags string bootClasspath classpath classpath classpath + processorPath classpath systemModules classpath aidlFlags string javaVersion string @@ -295,6 +296,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab } deps = append(deps, flags.classpath...) + deps = append(deps, flags.processorPath...) srcJarDir := "srcjars" outDir := "classes" @@ -315,6 +317,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab "javacFlags": flags.javacFlags, "bootClasspath": bootClasspath, "classpath": flags.classpath.FormJavaClassPath("-classpath"), + "processorpath": flags.processorPath.FormJavaClassPath("-processorpath"), "srcJars": strings.Join(srcJars.Strings(), " "), "srcJarDir": android.PathForModuleOut(ctx, intermediatesDir, srcJarDir).String(), "outDir": android.PathForModuleOut(ctx, intermediatesDir, outDir).String(), |