Merge "Fix race condition for jdiff/apicheck"

This commit is contained in:
Nan Zhang 2018-09-19 18:28:20 +00:00 committed by Gerrit Code Review
commit 2b2b6a72d3

View file

@ -1528,9 +1528,9 @@ func (d *Droidstubs) transformJdiff(ctx android.ModuleContext, implicits android
Implicits: implicits, Implicits: implicits,
ImplicitOutputs: implicitOutputs, ImplicitOutputs: implicitOutputs,
Args: map[string]string{ Args: map[string]string{
"outDir": android.PathForModuleOut(ctx, "out").String(), "outDir": android.PathForModuleOut(ctx, "jdiff-out").String(),
"srcJarDir": android.PathForModuleOut(ctx, "srcjars").String(), "srcJarDir": android.PathForModuleOut(ctx, "jdiff-srcjars").String(),
"stubsDir": android.PathForModuleOut(ctx, "stubsDir").String(), "stubsDir": android.PathForModuleOut(ctx, "jdiff-stubsDir").String(),
"srcJars": strings.Join(d.Javadoc.srcJars.Strings(), " "), "srcJars": strings.Join(d.Javadoc.srcJars.Strings(), " "),
"opts": opts, "opts": opts,
"bootclasspathArgs": bootclasspathArgs, "bootclasspathArgs": bootclasspathArgs,