Move bpglob to .bootstrap from .minibootstrap. (9d7cf6a3) · Commits · e / os / android_build_soong

ui/build/soong.go

+4 −6

Original line number	Diff line number	Diff line
		@@ -227,12 +227,10 @@ func runSoong(ctx Context, config Config) {
		// unused variables were changed?
		envFile := filepath.Join(config.SoongOutDir(), availableEnvFile)

		for _, n := range []string{".bootstrap", ".minibootstrap"} {
		dir := filepath.Join(config.SoongOutDir(), n)
		dir := filepath.Join(config.SoongOutDir(), ".bootstrap")
		if err := os.MkdirAll(dir, 0755); err != nil {
		ctx.Fatalf("Cannot mkdir " + dir)
		}
		}

		buildMode := config.bazelBuildMode()
		integratedBp2Build := (buildMode == mixedBuild) \|\| (buildMode == generateBuildFiles)
		@@ -272,7 +270,7 @@ func runSoong(ctx Context, config Config) {
		}
		}()

		runMicrofactory(ctx, config, ".minibootstrap/bpglob", "github.com/google/blueprint/bootstrap/bpglob",
		runMicrofactory(ctx, config, ".bootstrap/bpglob", "github.com/google/blueprint/bootstrap/bpglob",
		map[string]string{"github.com/google/blueprint": "build/blueprint"})

		ninja := func(name, ninjaFile string, targets ...string) {

+0 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ func testForDanglingRules(ctx Context, config Config) {

		outDir := config.OutDir()
		bootstrapDir := filepath.Join(outDir, "soong", ".bootstrap")
		miniBootstrapDir := filepath.Join(outDir, "soong", ".minibootstrap")
		modulePathsDir := filepath.Join(outDir, ".module_paths")
		variablesFilePath := filepath.Join(outDir, "soong", "soong.variables")

		@@ -89,7 +88,6 @@ func testForDanglingRules(ctx Context, config Config) {
		continue
		}
		if strings.HasPrefix(line, bootstrapDir) \|\|
		strings.HasPrefix(line, miniBootstrapDir) \|\|
		strings.HasPrefix(line, modulePathsDir) \|\|
		line == variablesFilePath \|\|
		line == dexpreoptConfigFilePath \|\|