From 5d5ed5fc6b6f6c192d2337d5592bcd31773cee02 Mon Sep 17 00:00:00 2001
From: "Lukacs T. Berki" <lberki@google.com>
Date: Tue, 7 Sep 2021 12:36:52 +0200
Subject: [PATCH] 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
---
 bootstrap/command.go | 44 +++++---------------------------------------
 1 file changed, 5 insertions(+), 39 deletions(-)

diff --git a/bootstrap/command.go b/bootstrap/command.go
index 6847236..e475709 100644
--- a/bootstrap/command.go
+++ b/bootstrap/command.go
@@ -31,48 +31,14 @@ import (
 
 type Args struct {
 	ModuleListFile string
-	OutDir         string
-	SoongOutDir    string
+	OutFile        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
+	NoGC       bool
+	Cpuprofile string
+	Memprofile string
+	TraceFile  string
 }
 
 // Returns the list of dependencies the emitted Ninja files has. These can be