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

Merge "Add bool to control if we need generate stubs src files."

Browse Source 
am: 423245dcc3

Change-Id: If69932d8d3bf2a721226c19d42404f6eaa65db37
This commit is contained in:
Nan Zhang
2018-04-16 17:19:50 -07:00
committed by android-build-merger
parent 288fd5d41e 423245dcc3
commit 3f8cbe202b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/droiddoc.go
View File

@@ -153,6 +153,9 @@ type DroiddocProperties struct {
// the generated exact API filename by Doclava. // the generated exact API filename by Doclava.
Exact_api_filename *string Exact_api_filename *string
// if set to false, don't allow droiddoc to generate stubs source files. Defaults to true.
Create_stubs *bool
} }
type Javadoc struct { type Javadoc struct {
@@ -391,7 +394,7 @@ func (j *Javadoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
"stubsDir": android.PathForModuleOut(ctx, "docs", "stubsDir").String(), "stubsDir": android.PathForModuleOut(ctx, "docs", "stubsDir").String(),
"srcJars": strings.Join(j.srcJars.Strings(), " "), "srcJars": strings.Join(j.srcJars.Strings(), " "),
"opts": opts, "opts": opts,
"bootClasspathArgs": bootClasspathArgs, "bootclasspathArgs": bootClasspathArgs,
"classpathArgs": classpathArgs, "classpathArgs": classpathArgs,
"sourcepath": strings.Join(j.sourcepaths.Strings(), ":"), "sourcepath": strings.Join(j.sourcepaths.Strings(), ":"),
"docZip": j.docZip.String(), "docZip": j.docZip.String(),
@@ -562,8 +565,11 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
"-doclet com.google.doclava.Doclava -docletpath ${config.JsilverJar}:${config.DoclavaJar} " + "-doclet com.google.doclava.Doclava -docletpath ${config.JsilverJar}:${config.DoclavaJar} " +
"-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")"` +
args + " -stubs " + android.PathForModuleOut(ctx, "docs", "stubsDir").String() " " + args
if BoolDefault(d.properties.Create_stubs, true) {
opts += " -stubs " + android.PathForModuleOut(ctx, "docs", "stubsDir").String()
}
implicitOutputs = append(implicitOutputs, d.Javadoc.docZip) implicitOutputs = append(implicitOutputs, d.Javadoc.docZip)
for _, o := range d.properties.Out { for _, o := range d.properties.Out {