Merge "Shard kythe invocations when javac is sharded" (2895bf71) · Commits · e / os / android_build_soong

java/builder.go

+7 −3

Original line number	Diff line number	Diff line
		@@ -229,10 +229,9 @@ func RunErrorProne(ctx android.ModuleContext, outputFile android.WritablePath,

		// Emits the rule to generate Xref input file (.kzip file) for the given set of source files and source jars
		// to compile with given set of builder flags, etc.
		func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath,
		func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx int,
		srcFiles, srcJars android.Paths,
		flags javaBuilderFlags, deps android.Paths,
		intermediatesDir string) {
		flags javaBuilderFlags, deps android.Paths) {

		deps = append(deps, srcJars...)

		@@ -260,6 +259,11 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath,
		processor = "-processor " + flags.processor
		}

		intermediatesDir := "xref"
		if idx >= 0 {
		intermediatesDir += strconv.Itoa(idx)
		}

		ctx.Build(pctx,
		android.BuildParams{
		Rule: kytheExtract,

java/java.go

+27 −12

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import (
		"strings"

		"github.com/google/blueprint"
		"github.com/google/blueprint/pathtools"
		"github.com/google/blueprint/proptools"

		"android/soong/android"
		@@ -1151,27 +1152,20 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
		if len(uniqueSrcFiles) > 0 {
		shardSrcs = shardPaths(uniqueSrcFiles, shardSize)
		for idx, shardSrc := range shardSrcs {
		classes := android.PathForModuleOut(ctx, "javac", jarName+strconv.Itoa(idx))
		TransformJavaToClasses(ctx, classes, idx, shardSrc, nil, flags, extraJarDeps)
		classes := j.compileJavaClasses(ctx, jarName, idx, shardSrc,
		nil, flags, extraJarDeps)
		jars = append(jars, classes)
		}
		}
		if len(srcJars) > 0 {
		classes := android.PathForModuleOut(ctx, "javac", jarName+strconv.Itoa(len(shardSrcs)))
		TransformJavaToClasses(ctx, classes, len(shardSrcs), nil, srcJars, flags, extraJarDeps)
		classes := j.compileJavaClasses(ctx, jarName, len(shardSrcs),
		nil, srcJars, flags, extraJarDeps)
		jars = append(jars, classes)
		}
		} else {
		classes := android.PathForModuleOut(ctx, "javac", jarName)
		TransformJavaToClasses(ctx, classes, -1, uniqueSrcFiles, srcJars, flags, extraJarDeps)
		classes := j.compileJavaClasses(ctx, jarName, -1, uniqueSrcFiles, srcJars, flags, extraJarDeps)
		jars = append(jars, classes)
		}
		if ctx.Config().EmitXrefRules() {
		extractionFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".kzip")
		emitXrefRule(ctx, extractionFile, uniqueSrcFiles, srcJars, flags, extraJarDeps, "xref")
		j.kytheFiles = append(j.kytheFiles, extractionFile)

		}
		if ctx.Failed() {
		return
		}
		@@ -1392,6 +1386,27 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
		j.outputFile = outputFile.WithoutRel()
		}

		func (j *Module) compileJavaClasses(ctx android.ModuleContext, jarName string, idx int,
		srcFiles, srcJars android.Paths, flags javaBuilderFlags, extraJarDeps android.Paths) android.WritablePath {

		kzipName := pathtools.ReplaceExtension(jarName, "kzip")
		if idx >= 0 {
		kzipName = strings.TrimSuffix(jarName, filepath.Ext(jarName)) + strconv.Itoa(idx) + ".kzip"
		jarName += strconv.Itoa(idx)
		}

		classes := android.PathForModuleOut(ctx, "javac", jarName)
		TransformJavaToClasses(ctx, classes, idx, srcFiles, srcJars, flags, extraJarDeps)

		if ctx.Config().EmitXrefRules() {
		extractionFile := android.PathForModuleOut(ctx, kzipName)
		emitXrefRule(ctx, extractionFile, idx, srcFiles, srcJars, flags, extraJarDeps)
		j.kytheFiles = append(j.kytheFiles, extractionFile)
		}

		return classes
		}

		// Check for invalid kotlinc flags. Only use this for flags explicitly passed by the user,
		// since some of these flags may be used internally.
		func CheckKotlincFlags(ctx android.ModuleContext, flags []string) {