Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ace4cf9 authored by Sam Saccone's avatar Sam Saccone Committed by Gerrit Code Review
Browse files

Merge "Only generate kythe xrefs on the primary module" into main

parents 3125b75d 9decf834

cc/builder.go

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ func transformSourceToObj(ctx ModuleContext, subdir string, srcFiles, noTidySrcs 
		coverageFiles = make(android.Paths, 0, len(srcFiles))

	}

	var kytheFiles android.Paths

	if flags.emitXrefs {

	if flags.emitXrefs && ctx.Module() == ctx.PrimaryModule() {

		kytheFiles = make(android.Paths, 0, len(srcFiles))

	}
@@ -664,7 +664,7 @@ func transformSourceToObj(ctx ModuleContext, subdir string, srcFiles, noTidySrcs 
		})



		// Register post-process build statements (such as for tidy or kythe).

		if emitXref {

		if emitXref && ctx.Module() == ctx.PrimaryModule() {

			kytheFile := android.ObjPathWithExt(ctx, subdir, srcFile, "kzip")

			ctx.Build(pctx, android.BuildParams{

				Rule:        kytheExtract,

java/base.go

+1 −1
Original line number Diff line number Diff line
@@ -1852,7 +1852,7 @@ func (j *Module) compileJavaClasses(ctx android.ModuleContext, jarName string, i 
	classes := android.PathForModuleOut(ctx, "javac", jarName).OutputPath

	TransformJavaToClasses(ctx, classes, idx, srcFiles, srcJars, annoSrcJar, flags, extraJarDeps)



	if ctx.Config().EmitXrefRules() {

	if ctx.Config().EmitXrefRules() && ctx.Module() == ctx.PrimaryModule() {

		extractionFile := android.PathForModuleOut(ctx, kzipName)

		emitXrefRule(ctx, extractionFile, idx, srcFiles, srcJars, flags, extraJarDeps)

		j.kytheFiles = append(j.kytheFiles, extractionFile)