Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d37831d authored by Colin Cross's avatar Colin Cross
Browse files

Use PathForSource instead of PathsForSource 

PathForSource does the AllowMissingDependencies check now, use it
instead of PathsForSource.

Test: m checkbuild
Change-Id: If1894fd98d8d757ebc3c1635d5fcea86f81bfc4a
parent 94a32104

java/droiddoc.go

+3 −5
Original line number Diff line number Diff line
@@ -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()