From 51b625928df22cba78c73c5c63691eda86be0e6b Mon Sep 17 00:00:00 2001
From: "Lukacs T. Berki" <lberki@google.com>
Date: Thu, 19 Aug 2021 16:26:36 +0200
Subject: [PATCH] Do not separate .primary and .bootstrap dirs.

This makes it possible to share work between the bootstrap and the main
Ninja file.

As a side fix, remove the reference to $srcDir from moduleSrcDir() since
that is hardwired to "." anyway.

Test: Presubmits.
Change-Id: Ia4a251dd34273ec3e0436ac7a2fbafe4ef46c73f
---
 bootstrap/bootstrap.go | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index b15f74f..d014afb 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -25,7 +25,6 @@ import (
 	"github.com/google/blueprint/pathtools"
 )
 
-const mainSubDir = ".primary"
 const bootstrapSubDir = ".bootstrap"
 
 var (
@@ -328,7 +327,7 @@ func (g *goPackage) GenerateBuildActions(ctx blueprint.ModuleContext) {
 		return
 	}
 
-	g.pkgRoot = packageRoot(ctx, g.config)
+	g.pkgRoot = packageRoot(ctx)
 	g.archiveFile = filepath.Join(g.pkgRoot,
 		filepath.FromSlash(g.properties.PkgPath)+".a")
 
@@ -353,9 +352,9 @@ func (g *goPackage) GenerateBuildActions(ctx blueprint.ModuleContext) {
 	}
 
 	if g.config.runGoTests {
-		testArchiveFile := filepath.Join(testRoot(ctx, g.config),
+		testArchiveFile := filepath.Join(testRoot(ctx),
 			filepath.FromSlash(g.properties.PkgPath)+".a")
-		g.testResultFile = buildGoTest(ctx, testRoot(ctx, g.config), testArchiveFile,
+		g.testResultFile = buildGoTest(ctx, testRoot(ctx), testArchiveFile,
 			g.properties.PkgPath, srcs, genSrcs,
 			testSrcs, g.config.useValidations)
 	}
@@ -437,9 +436,9 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
 
 	var (
 		name            = ctx.ModuleName()
-		objDir          = moduleObjDir(ctx, g.config)
+		objDir          = moduleObjDir(ctx)
 		archiveFile     = filepath.Join(objDir, name+".a")
-		testArchiveFile = filepath.Join(testRoot(ctx, g.config), name+".a")
+		testArchiveFile = filepath.Join(testRoot(ctx), name+".a")
 		aoutFile        = filepath.Join(objDir, "a.out")
 		hasPlugins      = false
 		pluginSrc       = ""
@@ -450,7 +449,7 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
 		g.installPath = filepath.Join(toolDir(ctx.Config()), name)
 	} else {
 		buildDir := ctx.Config().(BootstrapConfig).BuildDir()
-		g.installPath = filepath.Join(buildDir, stageSubdir(g.config), "bin", name)
+		g.installPath = filepath.Join(buildDir, bootstrapSubDir, "bin", name)
 	}
 
 	ctx.VisitDepsDepthFirstIf(isGoPluginFor(name),
@@ -476,7 +475,7 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
 	}
 
 	if g.config.runGoTests {
-		testDeps = buildGoTest(ctx, testRoot(ctx, g.config), testArchiveFile,
+		testDeps = buildGoTest(ctx, testRoot(ctx), testArchiveFile,
 			name, srcs, genSrcs, testSrcs, g.config.useValidations)
 	}
 
@@ -778,44 +777,36 @@ func (s *singleton) GenerateBuildActions(ctx blueprint.SingletonContext) {
 	}
 }
 
-func stageSubdir(config *Config) string {
-	if config.stage == StageMain {
-		return mainSubDir
-	} else {
-		return bootstrapSubDir
-	}
-}
-
 // packageRoot returns the module-specific package root directory path.  This
 // directory is where the final package .a files are output and where dependant
 // modules search for this package via -I arguments.
-func packageRoot(ctx blueprint.ModuleContext, config *Config) string {
+func packageRoot(ctx blueprint.ModuleContext) string {
 	buildDir := ctx.Config().(BootstrapConfig).BuildDir()
-	return filepath.Join(buildDir, stageSubdir(config), ctx.ModuleName(), "pkg")
+	return filepath.Join(buildDir, bootstrapSubDir, ctx.ModuleName(), "pkg")
 }
 
 // testRoot returns the module-specific package root directory path used for
 // building tests. The .a files generated here will include everything from
 // packageRoot, plus the test-only code.
-func testRoot(ctx blueprint.ModuleContext, config *Config) string {
+func testRoot(ctx blueprint.ModuleContext) string {
 	buildDir := ctx.Config().(BootstrapConfig).BuildDir()
-	return filepath.Join(buildDir, stageSubdir(config), ctx.ModuleName(), "test")
+	return filepath.Join(buildDir, bootstrapSubDir, ctx.ModuleName(), "test")
 }
 
 // moduleSrcDir returns the path of the directory that all source file paths are
 // specified relative to.
 func moduleSrcDir(ctx blueprint.ModuleContext) string {
-	return filepath.Join("$srcDir", ctx.ModuleDir())
+	return ctx.ModuleDir()
 }
 
 // moduleObjDir returns the module-specific object directory path.
-func moduleObjDir(ctx blueprint.ModuleContext, config *Config) string {
+func moduleObjDir(ctx blueprint.ModuleContext) string {
 	buildDir := ctx.Config().(BootstrapConfig).BuildDir()
-	return filepath.Join(buildDir, stageSubdir(config), ctx.ModuleName(), "obj")
+	return filepath.Join(buildDir, bootstrapSubDir, ctx.ModuleName(), "obj")
 }
 
 // moduleGenSrcDir returns the module-specific generated sources path.
 func moduleGenSrcDir(ctx blueprint.ModuleContext, config *Config) string {
 	buildDir := ctx.Config().(BootstrapConfig).BuildDir()
-	return filepath.Join(buildDir, stageSubdir(config), ctx.ModuleName(), "gen")
+	return filepath.Join(buildDir, bootstrapSubDir, ctx.ModuleName(), "gen")
 }