commit ca62abc7766736abe5b9bdd1af58b24504e5e7b4
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 30 01:06:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 30 01:06:08 2018 +0000
tree 5ea7859f84ca9f51d8fd0dcf263d8842b9806ca6
parent 42f19a7987b9ac93eded08189de170d9c51ac73c
parent 15f2dfe4828ade5bf44b1bf24db1bc83ee29beab

Merge "Move paste(1) to toybox."

java/droiddoc.go

diff --git a/java/droiddoc.go b/java/droiddoc.go
index 0c4877a..9cde189 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -1129,9 +1129,9 @@
 		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 @@
 		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,