diff options
| author | Colin Cross <ccross@android.com> | 2018-02-22 14:39:17 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-02-23 11:31:45 -0800 |
| commit | 480cd76672b2667f0870e1e3e41f1cb474d62a55 (patch) | |
| tree | 8f6bd6952455535fb2fb8b72133aaa54c862168a /java | |
| parent | 192e97a95c8bd4e505264fafcc442ddb9abad74f (diff) | |
| download | build_soong-480cd76672b2667f0870e1e3e41f1cb474d62a55.tar.gz build_soong-480cd76672b2667f0870e1e3e41f1cb474d62a55.tar.bz2 build_soong-480cd76672b2667f0870e1e3e41f1cb474d62a55.zip | |
Use PathForSource instead of PathsForSource
This reapplies If1690a708393964d3030cb908beaf7b6897c0084.
PathForSource does the AllowMissingDependencies check now, use it
instead of PathsForSource.
Test: m checkbuild
Change-Id: I84868c92ee43779f9b5c8b285dac92f5f87b018c
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() |