Merge "Remove --multitree-build" into main am: 7c8cf91ff8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982507 Change-Id: I86c17fc27621ce32ebf555ba4c2222b1ad4c0dec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -91,8 +91,6 @@ type CmdArgs struct {
|
||||
ModuleActionsFile string
|
||||
DocFile string
|
||||
|
||||
MultitreeBuild bool
|
||||
|
||||
BuildFromSourceStub bool
|
||||
|
||||
EnsureAllowlistIntegrity bool
|
||||
@@ -288,10 +286,6 @@ type config struct {
|
||||
|
||||
BuildMode SoongBuildMode
|
||||
|
||||
// If MultitreeBuild is true then this is one inner tree of a multitree
|
||||
// build directed by the multitree orchestrator.
|
||||
MultitreeBuild bool
|
||||
|
||||
// If testAllowNonExistentPaths is true then PathForSource and PathForModuleSrc won't error
|
||||
// in tests when a path doesn't exist.
|
||||
TestAllowNonExistentPaths bool
|
||||
@@ -541,8 +535,6 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error)
|
||||
moduleListFile: cmdArgs.ModuleListFile,
|
||||
fs: pathtools.NewOsFs(absSrcDir),
|
||||
|
||||
MultitreeBuild: cmdArgs.MultitreeBuild,
|
||||
|
||||
buildFromSourceStub: cmdArgs.BuildFromSourceStub,
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user