diff options
| author | 2019-09-13 00:47:43 +0000 | |
|---|---|---|
| committer | 2019-09-13 00:47:43 +0000 | |
| commit | dd15afa1cad583bcd71224fced53446c3928abed (patch) | |
| tree | 88cbfc4d0007ee72b7acedbe83833e8558cf9b15 /java/droiddoc.go | |
| parent | ee3f105f258cc077c76d2e202ef8fb6084db8bcc (diff) | |
| parent | 26bce340e3ce6aac7c5a63735f788d2dc4de859c (diff) | |
Merge "Track switch to toybox date for macOS."
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 9eaa1b673..5deac5ea9 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -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 |