diff options
| author | Colin Cross <ccross@android.com> | 2018-02-23 07:46:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-23 07:46:23 +0000 |
| commit | dd5d40eb37ccc6fab9ac978920f973645bc16dd3 (patch) | |
| tree | cb766ad141697a158a1446f8dc16bb2d1d4e9997 | |
| parent | d543f3759888a07d19ea3c091acda5cf5328a842 (diff) | |
| parent | be6724dd3014206aad6afe15e94910696c14a92b (diff) | |
| download | build_soong-dd5d40eb37ccc6fab9ac978920f973645bc16dd3.tar.gz build_soong-dd5d40eb37ccc6fab9ac978920f973645bc16dd3.tar.bz2 build_soong-dd5d40eb37ccc6fab9ac978920f973645bc16dd3.zip | |
Merge "Revert "Use PathForSource instead of PathsForSource"" am: 0c18d451d2
am: be6724dd30
Change-Id: I3713d1fa4a5e0121e6de2e6c87c3c170cd8a9276
| -rw-r--r-- | java/droiddoc.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index ac6bd338..efd430ad 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -374,8 +374,10 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { } // templateDir (maybe missing) is relative to top of the source tree instead of current module. - templateDir := android.PathForSource(ctx, String(d.properties.Custom_template_dir)).String() - implicits = append(implicits, ctx.GlobFiles(filepath.Join(templateDir, "**/*"), nil)...) + 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)...) + } var htmlDirArgs string if len(d.properties.Html_dirs) > 0 { @@ -418,7 +420,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 " + templateDir + " " + htmlDirArgs + " " + htmlDir2Args + " " + + "-templatedir " + String(d.properties.Custom_template_dir) + " " + 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() |