Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 200e0a86 authored by Lukacs T. Berki's avatar Lukacs T. Berki Committed by Automerger Merge Worker
Browse files

Handle errors from RunBlueprint(). am: c357c81f 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627181



Change-Id: Icaec3e02a1bda4985bce2e03fa2d1a6295e82104
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0b01a78 c357c81f

cmd/soong_build/main.go

+11 −6
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ func runMixedModeBuild(ctx *android.Context, extraNinjaDeps []string) string { 
		return ctx.Config().BazelContext.InvokeBazel(ctx.Config(), ctx)

	}

	ctx.SetBeforePrepareBuildActionsHook(bazelHook)

	ninjaDeps := bootstrap.RunBlueprint(cmdlineArgs.Args, bootstrap.DoEverything, ctx.Context, ctx.Config())

	ninjaDeps, err := bootstrap.RunBlueprint(cmdlineArgs.Args, bootstrap.DoEverything, ctx.Context, ctx.Config())

	maybeQuit(err, "")

	ninjaDeps = append(ninjaDeps, extraNinjaDeps...)



	bazelPaths, err := readFileLines(ctx.Config().Getenv("BAZEL_DEPS_FILE"))
@@ -185,10 +186,11 @@ func runApiBp2build(ctx *android.Context, extraNinjaDeps []string) string { 
	}



	// Run the loading and analysis phase

	ninjaDeps := bootstrap.RunBlueprint(cmdlineArgs.Args,

	ninjaDeps, err := bootstrap.RunBlueprint(cmdlineArgs.Args,

		bootstrap.StopBeforePrepareBuildActions,

		ctx.Context,

		ctx.Config())

	maybeQuit(err, "")

	ninjaDeps = append(ninjaDeps, extraNinjaDeps...)



	// Add the globbed dependencies
@@ -218,7 +220,7 @@ func runApiBp2build(ctx *android.Context, extraNinjaDeps []string) string { 
	// }

	//

	// If we don't generate f/b/api/BUILD, foo.contribution will be unbuildable.

	err := createBazelWorkspace(codegenContext, absoluteApiBp2buildDir, true)

	err = createBazelWorkspace(codegenContext, absoluteApiBp2buildDir, true)

	maybeQuit(err, "")

	ninjaDeps = append(ninjaDeps, codegenContext.AdditionalNinjaDeps()...)
@@ -412,12 +414,13 @@ func writeBuildGlobsNinjaFile(ctx *android.Context) []string { 
	defer ctx.EventHandler.End("globs_ninja_file")



	globDir := bootstrap.GlobDirectory(ctx.Config().SoongOutDir(), globListDir)

	bootstrap.WriteBuildGlobsNinjaFile(&bootstrap.GlobSingleton{

	err := bootstrap.WriteBuildGlobsNinjaFile(&bootstrap.GlobSingleton{

		GlobLister: ctx.Globs,

		GlobFile:   globFile,

		GlobDir:    globDir,

		SrcDir:     ctx.SrcDir(),

	}, ctx.Config())

	maybeQuit(err, "")

	return bootstrap.GlobFileListFiles(globDir)

}
@@ -444,7 +447,8 @@ func runSoongOnlyBuild(ctx *android.Context, extraNinjaDeps []string) string { 
		stopBefore = bootstrap.DoEverything

	}



	ninjaDeps := bootstrap.RunBlueprint(cmdlineArgs.Args, stopBefore, ctx.Context, ctx.Config())

	ninjaDeps, err := bootstrap.RunBlueprint(cmdlineArgs.Args, stopBefore, ctx.Context, ctx.Config())

	maybeQuit(err, "")

	ninjaDeps = append(ninjaDeps, extraNinjaDeps...)



	globListFiles := writeBuildGlobsNinjaFile(ctx)
@@ -803,8 +807,9 @@ func runBp2Build(ctx *android.Context, extraNinjaDeps []string, metricsDir strin 
		// from the regular Modules.

		ctx.EventHandler.Do("bootstrap", func() {

			blueprintArgs := cmdlineArgs

			bootstrapDeps := bootstrap.RunBlueprint(blueprintArgs.Args,

			bootstrapDeps, err := bootstrap.RunBlueprint(blueprintArgs.Args,

				bootstrap.StopBeforePrepareBuildActions, ctx.Context, ctx.Config())

			maybeQuit(err, "")

			ninjaDeps = append(ninjaDeps, bootstrapDeps...)

		})

ui/build/soong.go

+4 −1
Original line number Diff line number Diff line
@@ -445,7 +445,10 @@ func bootstrapBlueprint(ctx Context, config Config) { 


	// since `bootstrap.ninja` is regenerated unconditionally, we ignore the deps, i.e. little

	// reason to write a `bootstrap.ninja.d` file

	_ = bootstrap.RunBlueprint(blueprintArgs, bootstrap.DoEverything, blueprintCtx, blueprintConfig)

	_, err := bootstrap.RunBlueprint(blueprintArgs, bootstrap.DoEverything, blueprintCtx, blueprintConfig)

	if err != nil {

		ctx.Fatal(err)

	}

}



func checkEnvironmentFile(ctx Context, currentEnv *Environment, envFile string) {