diff options
| author | Colin Cross <ccross@android.com> | 2018-06-21 03:57:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-21 03:57:17 +0000 |
| commit | ab97ae08cd60bae555c0689aed7c182f2e97864b (patch) | |
| tree | 67a3ce01ad400614afcc1de805b9e6d4a262892f | |
| parent | 1418fe2e4cfbd42f188388612452b4084c674e1e (diff) | |
| parent | 2f10997e6b108e1faef7fa8d17c19f1700f06653 (diff) | |
| download | build_soong-ab97ae08cd60bae555c0689aed7c182f2e97864b.tar.gz build_soong-ab97ae08cd60bae555c0689aed7c182f2e97864b.tar.bz2 build_soong-ab97ae08cd60bae555c0689aed7c182f2e97864b.zip | |
Merge "Revert "Use -processorpath for annotation processors""
| -rw-r--r-- | java/builder.go | 7 | ||||
| -rw-r--r-- | java/java.go | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/java/builder.go b/java/builder.go index 2cf162d5..d338623d 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} ` + - `$processorpath $javacFlags $bootClasspath $classpath ` + + `$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", "processorpath", "srcJars", "srcJarDir", + "javacFlags", "bootClasspath", "classpath", "srcJars", "srcJarDir", "outDir", "annoDir", "javaVersion") kotlinc = pctx.AndroidGomaStaticRule("kotlinc", @@ -155,7 +155,6 @@ type javaBuilderFlags struct { javacFlags string bootClasspath classpath classpath classpath - processorPath classpath systemModules classpath aidlFlags string javaVersion string @@ -296,7 +295,6 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab } deps = append(deps, flags.classpath...) - deps = append(deps, flags.processorPath...) srcJarDir := "srcjars" outDir := "classes" @@ -317,7 +315,6 @@ 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(), diff --git a/java/java.go b/java/java.go index 86c3c21c..8179df8c 100644 --- a/java/java.go +++ b/java/java.go @@ -331,7 +331,6 @@ type dependencyTag struct { var ( staticLibTag = dependencyTag{name: "staticlib"} libTag = dependencyTag{name: "javalib"} - annoTag = dependencyTag{name: "annotation processor"} bootClasspathTag = dependencyTag{name: "bootclasspath"} systemModulesTag = dependencyTag{name: "system modules"} frameworkResTag = dependencyTag{name: "framework-res"} @@ -522,7 +521,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { ctx.AddDependency(ctx.Module(), libTag, j.properties.Libs...) ctx.AddDependency(ctx.Module(), staticLibTag, j.properties.Static_libs...) - ctx.AddDependency(ctx.Module(), annoTag, j.properties.Annotation_processors...) + ctx.AddDependency(ctx.Module(), libTag, j.properties.Annotation_processors...) android.ExtractSourcesDeps(ctx, j.properties.Srcs) android.ExtractSourcesDeps(ctx, j.properties.Exclude_srcs) @@ -603,7 +602,6 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt type deps struct { classpath classpath bootClasspath classpath - processorPath classpath staticJars android.Paths staticHeaderJars android.Paths staticJarResources android.Paths @@ -728,8 +726,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { deps.staticHeaderJars = append(deps.staticHeaderJars, dep.HeaderJars()...) // sdk lib names from dependencies are re-exported j.exportedSdkLibs = append(j.exportedSdkLibs, dep.ExportedSdkLibs()...) - case annoTag: - deps.processorPath = append(deps.processorPath, dep.ImplementationJars()...) case frameworkResTag: if ctx.ModuleName() == "framework" { // framework.jar has a one-off dependency on the R.java and Manifest.java files @@ -854,7 +850,6 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB // classpath flags.bootClasspath = append(flags.bootClasspath, deps.bootClasspath...) flags.classpath = append(flags.classpath, deps.classpath...) - flags.processorPath = append(flags.processorPath, deps.processorPath...) if len(flags.bootClasspath) == 0 && ctx.Host() && !ctx.Config().TargetOpenJDK9() && !Bool(j.properties.No_standard_libs) && |