Remove PrimaryBuilderExtraFlags and cull Args. am: 5d5ed5fc6b
am: 32d5d542d2
am: 1ff903cbac
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1819862 Change-Id: I57160712692e5efe60558e18b9534fa289089aa9
This commit is contained in:
commit
1040846cd3
1 changed files with 5 additions and 39 deletions
|
@ -31,48 +31,14 @@ import (
|
||||||
|
|
||||||
type Args struct {
|
type Args struct {
|
||||||
ModuleListFile string
|
ModuleListFile string
|
||||||
OutDir string
|
OutFile string
|
||||||
SoongOutDir string
|
|
||||||
|
|
||||||
OutFile string
|
|
||||||
Subninjas []string
|
|
||||||
PrimaryBuilderInvocations []PrimaryBuilderInvocation
|
|
||||||
|
|
||||||
RunGoTests bool
|
|
||||||
UseValidations bool
|
|
||||||
EmptyNinjaFile bool
|
EmptyNinjaFile bool
|
||||||
|
|
||||||
NoGC bool
|
NoGC bool
|
||||||
Cpuprofile string
|
Cpuprofile string
|
||||||
Memprofile string
|
Memprofile string
|
||||||
DelveListen string
|
TraceFile string
|
||||||
DelvePath string
|
|
||||||
TraceFile string
|
|
||||||
}
|
|
||||||
|
|
||||||
func PrimaryBuilderExtraFlags(args Args, mainNinjaFile string) []string {
|
|
||||||
result := make([]string, 0)
|
|
||||||
|
|
||||||
if args.RunGoTests {
|
|
||||||
result = append(result, "-t")
|
|
||||||
}
|
|
||||||
|
|
||||||
result = append(result, "-l", args.ModuleListFile)
|
|
||||||
result = append(result, "-o", mainNinjaFile)
|
|
||||||
|
|
||||||
if args.EmptyNinjaFile {
|
|
||||||
result = append(result, "--empty-ninja-file")
|
|
||||||
}
|
|
||||||
|
|
||||||
if args.DelveListen != "" {
|
|
||||||
result = append(result, "--delve_listen", args.DelveListen)
|
|
||||||
}
|
|
||||||
|
|
||||||
if args.DelvePath != "" {
|
|
||||||
result = append(result, "--delve_path", args.DelvePath)
|
|
||||||
}
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the list of dependencies the emitted Ninja files has. These can be
|
// Returns the list of dependencies the emitted Ninja files has. These can be
|
||||||
|
|
Loading…
Reference in a new issue