Remove PrimaryBuilderExtraFlags and cull Args. am: 5d5ed5fc6b am: 32d5d542d2 am: 1ff903cbac am: 1040846cd3 am: 31a3793c7f

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1819862

Change-Id: I509695ae8bf230f271bfa581bb97886155e876e5
This commit is contained in:
Lukacs T. Berki 2021-09-08 14:35:04 +00:00 committed by Automerger Merge Worker
commit 69d449b9ad

View file

@ -31,50 +31,16 @@ import (
type Args struct {
ModuleListFile string
OutDir string
SoongOutDir string
OutFile string
Subninjas []string
PrimaryBuilderInvocations []PrimaryBuilderInvocation
RunGoTests bool
UseValidations bool
EmptyNinjaFile bool
NoGC bool
Cpuprofile string
Memprofile string
DelveListen 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
// written to the .d file for the output so that it is correctly rebuilt when
// needed in case Blueprint is itself invoked from Ninja