Remove PrimaryBuilderExtraFlags and cull Args.

PrimaryBuilderExtra flags was only used from soong_ui and has nothing to
do with Blueprint files or modules and Args contained a lot of members
that were likewise only used for plumbing withing soong_ui or for
command line processing for soong_build.

Test: Presubmits.
Change-Id: Ibf009e446b4044309a331592a88a4aa86b4801e3
This commit is contained in:
Lukacs T. Berki 2021-09-07 12:36:52 +02:00
parent 70d6564d7d
commit 5d5ed5fc6b

View file

@ -31,50 +31,16 @@ import (
type Args struct { type Args struct {
ModuleListFile string ModuleListFile string
OutDir string
SoongOutDir string
OutFile 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
DelvePath string
TraceFile 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
// written to the .d file for the output so that it is correctly rebuilt when // written to the .d file for the output so that it is correctly rebuilt when
// needed in case Blueprint is itself invoked from Ninja // needed in case Blueprint is itself invoked from Ninja