Merge "Track switch to toybox date for macOS." (dd15afa1) · Commits · e / os / android_build_soong

java/droiddoc.go

+1 −9

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package java
		import (
		"fmt"
		"path/filepath"
		"runtime"
		"strings"

		"github.com/google/blueprint/proptools"
		@@ -687,13 +686,6 @@ func (d *Droiddoc) DepsMutator(ctx android.BottomUpMutatorContext) {
		}

		func (d Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd android.RuleBuilderCommand, docletPath classpath) {
		var date string
		if runtime.GOOS == "darwin" {
		date = `date -r`
		} else {
		date = `date -d @`
		}

		// Droiddoc always gets "-source 1.8" because it doesn't support 1.9 sources. For modules with 1.9
		// sources, droiddoc will get sources produced by metalava which will have already stripped out the
		// 1.9 language features.
		@@ -704,7 +696,7 @@ func (d Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd android.Rule
		FlagWithArg("-doclet ", "com.google.doclava.Doclava").
		FlagWithInputList("-docletpath ", docletPath.Paths(), ":").
		FlagWithArg("-hdf page.build ", ctx.Config().BuildId()+"-"+ctx.Config().BuildNumberFromFile()).
		FlagWithArg("-hdf page.now ", `"$(`+date+`$(cat `+ctx.Config().Getenv("BUILD_DATETIME_FILE")+`) "+%d %b %Y %k:%M")" `)
		FlagWithArg("-hdf page.now ", `"$(date -d @$(cat `+ctx.Config().Getenv("BUILD_DATETIME_FILE")+`) "+%d %b %Y %k:%M")" `)

		if String(d.properties.Custom_template) == "" {
		// TODO: This is almost always droiddoc-templates-sdk

+0 −3

Original line number	Diff line number	Diff line
		@@ -118,9 +118,6 @@ var Configuration = map[string]PathConfig{
		"ld.gold": Forbidden,
		"pkg-config": Forbidden,

		// These are currently Linux-only toybox tools (but can be switched now).
		"date": LinuxOnlyPrebuilt,

		// These are toybox tools that only work on Linux.
		"pgrep": LinuxOnlyPrebuilt,
		"pkill": LinuxOnlyPrebuilt,