diff options
| author | Colin Cross <ccross@android.com> | 2018-02-24 00:39:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-24 00:39:56 +0000 |
| commit | d2092dbc0dde66212a57bc62d9b5ea7cfd623e0a (patch) | |
| tree | 0a10c2ef60cffef74b8a9c6d82d23fc67471e8d3 /java | |
| parent | 7c695eb797d9b34f2a3205f474091ef61a307bb2 (diff) | |
| parent | 480cd76672b2667f0870e1e3e41f1cb474d62a55 (diff) | |
| download | build_soong-d2092dbc0dde66212a57bc62d9b5ea7cfd623e0a.tar.gz build_soong-d2092dbc0dde66212a57bc62d9b5ea7cfd623e0a.tar.bz2 build_soong-d2092dbc0dde66212a57bc62d9b5ea7cfd623e0a.zip | |
Merge changes I84868c92,If1690a70,Ia9aeb2ff
* changes:
Use PathForSource instead of PathsForSource
Move AllowMissingDependencies check from PathsForSource to PathForSource
Pass nil instead of []string{} to ctx.Glob* functions
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index efd430ad..ac6bd338 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -374,10 +374,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { } // templateDir (maybe missing) is relative to top of the source tree instead of current module. - templateDir := android.PathsForSource(ctx, []string{String(d.properties.Custom_template_dir)}) - if len(templateDir) > 0 { - implicits = append(implicits, ctx.GlobFiles(filepath.Join(templateDir[0].String(), "**/*"), nil)...) - } + templateDir := android.PathForSource(ctx, String(d.properties.Custom_template_dir)).String() + implicits = append(implicits, ctx.GlobFiles(filepath.Join(templateDir, "**/*"), nil)...) var htmlDirArgs string if len(d.properties.Html_dirs) > 0 { @@ -420,7 +418,7 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { opts := "-source 1.8 -J-Xmx1600m -J-XX:-OmitStackTraceInFastThrow -XDignore.symbol.file " + "-doclet com.google.doclava.Doclava -docletpath ${config.JsilverJar}:${config.DoclavaJar} " + - "-templatedir " + String(d.properties.Custom_template_dir) + " " + htmlDirArgs + " " + htmlDir2Args + " " + + "-templatedir " + templateDir + " " + htmlDirArgs + " " + htmlDir2Args + " " + "-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")"` + " " + args + " -stubs " + android.PathForModuleOut(ctx, "docs", "stubsDir").String() |