StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the undefined CommandDeps for standard Javadoc"

Browse Source
This commit is contained in:
Nan Zhang
2018-04-24 23:00:37 +00:00
committed by Gerrit Code Review
parent 9850f48dda 30963749fd
commit f9a34b667f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/droiddoc.go
View File

@@ -38,15 +38,13 @@ var (
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",
"${config.JavadocCmd}", "${config.JavadocCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
"$JsilverJar",
"$DoclavaJar",
}, },
Rspfile: "$out.rsp", Rspfile: "$out.rsp",
RspfileContent: "$in", RspfileContent: "$in",
Restat: true, Restat: true,
}, },
"outDir", "srcJarDir", "stubsDir", "srcJars", "opts", "outDir", "srcJarDir", "stubsDir", "srcJars", "opts",
"bootclasspathArgs", "classpathArgs", "sourcepath", "docZip", "JsilverJar", "DoclavaJar") "bootclasspathArgs", "classpathArgs", "sourcepath", "docZip")
) )
func init() { func init() {
@@ -577,8 +575,13 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
implicits = append(implicits, d.Javadoc.srcJars...) implicits = append(implicits, d.Javadoc.srcJars...)
jsilver := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "jsilver.jar")
doclava := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "doclava.jar")
implicits = append(implicits, jsilver)
implicits = append(implicits, doclava)
opts := "-source 1.8 -J-Xmx1600m -J-XX:-OmitStackTraceInFastThrow -XDignore.symbol.file " + opts := "-source 1.8 -J-Xmx1600m -J-XX:-OmitStackTraceInFastThrow -XDignore.symbol.file " +
"-doclet com.google.doclava.Doclava -docletpath ${config.JsilverJar}:${config.DoclavaJar} " + "-doclet com.google.doclava.Doclava -docletpath " + jsilver.String() + ":" + doclava.String() + " " +
"-templatedir " + templateDir + " " + htmlDirArgs + " " + htmlDir2Args + " " + "-templatedir " + templateDir + " " + htmlDirArgs + " " + htmlDir2Args + " " +
"-hdf page.build " + ctx.Config().BuildId() + "-" + ctx.Config().BuildNumberFromFile() + " " + "-hdf page.build " + ctx.Config().BuildId() + "-" + ctx.Config().BuildNumberFromFile() + " " +
"-hdf page.now " + `"$$(date -d @$$(cat ` + ctx.Config().Getenv("BUILD_DATETIME_FILE") + `) "+%d %b %Y %k:%M")"` + "-hdf page.now " + `"$$(date -d @$$(cat ` + ctx.Config().Getenv("BUILD_DATETIME_FILE") + `) "+%d %b %Y %k:%M")"` +
@@ -609,8 +612,6 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
"classpathArgs": classpathArgs, "classpathArgs": classpathArgs,
"sourcepath": strings.Join(d.Javadoc.sourcepaths.Strings(), ":"), "sourcepath": strings.Join(d.Javadoc.sourcepaths.Strings(), ":"),
"docZip": d.Javadoc.docZip.String(), "docZip": d.Javadoc.docZip.String(),
"JsilverJar": "${config.JsilverJar}",
"DoclavaJar": "${config.DoclavaJar}",
}, },
}) })
} }