From 5a49e1c65e293717b4eadd73d6c5686656a6b1a6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 23 Feb 2018 07:08:43 +0000 Subject: [PATCH] Revert "Use PathForSource instead of PathsForSource" This reverts commit 9d37831dd3f5a8133c0fc353ce1993e1585aa178. Reason for revert: Broke builds with ALLOW_MISSING_DEPENDENCIES=true Change-Id: Ibff79642f747b83364c83d6b298334121028e02d --- java/droiddoc.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/droiddoc.go b/java/droiddoc.go index ac6bd3388..efd430ada 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()