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

Commit 3ffc3525 authored by Nan Zhang's avatar Nan Zhang
Browse files

Change srcjarDir/stubsDirs to a different name. 

Otherwise it might have the chance to clobber each other
if the rules ran at the same time.

Test: m -j docs
Bug: b/119671939
Change-Id: Ia57e62f0899e5c61539516833c6e3db88547932e
parent a6703fe6

java/droiddoc.go

+4 −4
Original line number Diff line number Diff line
@@ -1129,9 +1129,9 @@ func (d *Droiddoc) transformDokka(ctx android.ModuleContext, implicits android.P 
		Inputs:      d.Javadoc.srcFiles,

		Implicits:   implicits,

		Args: map[string]string{

			"outDir":        android.PathForModuleOut(ctx, "out").String(),

			"srcJarDir":     android.PathForModuleOut(ctx, "srcjars").String(),

			"stubsDir":      android.PathForModuleOut(ctx, "stubsDir").String(),

			"outDir":        android.PathForModuleOut(ctx, "dokka-out").String(),

			"srcJarDir":     android.PathForModuleOut(ctx, "dokka-srcjars").String(),

			"stubsDir":      android.PathForModuleOut(ctx, "dokka-stubsDir").String(),

			"srcJars":       strings.Join(d.Javadoc.srcJars.Strings(), " "),

			"classpathArgs": classpathArgs,

			"opts":          opts,
@@ -1585,7 +1585,7 @@ func (d *Droidstubs) transformCheckApi(ctx android.ModuleContext, 
		Implicits: append(android.Paths{apiFile, removedApiFile, d.apiFile, d.removedApiFile},

			implicits...),

		Args: map[string]string{

			"srcJarDir":         android.PathForModuleOut(ctx, "srcjars").String(),

			"srcJarDir":         android.PathForModuleOut(ctx, "apicheck-srcjars").String(),

			"srcJars":           strings.Join(d.Javadoc.srcJars.Strings(), " "),

			"javaVersion":       javaVersion,

			"bootclasspathArgs": bootclasspathArgs,