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

Commit 067210f7 authored by Spandan Das's avatar Spandan Das
Browse files

Create soong_injection files in ReadWrite mode 

The synthetic soong_injection workspace is shared between api_bp2build
(used in API export) and bp2build (used in API domain analysis which
runs mixed builds by default). The former creates them in ReadOnly mode,
but the latter creates them in ReadWrite mode (to allow users to
edit/experiment). To prevent errors in the end-to-end builds in
multittree, make api_bp2build create these files in ReadWrite mode as
well.

Test: mulittree_build locally
Change-Id: I8766d88951a3b625739e4dc12d468450ad7322ea
parent c082eb8e

cmd/soong_build/main.go

+6 −1
Original line number Diff line number Diff line
@@ -237,7 +237,12 @@ func runApiBp2build(configuration android.Config, ctx *android.Context, extraNin 
	soongInjectionFiles := bp2build.CreateSoongInjectionFiles(configuration, bp2build.CreateCodegenMetrics())

	absoluteSoongInjectionDir := shared.JoinPath(topDir, configuration.SoongOutDir(), bazel.SoongInjectionDirName)

	for _, file := range soongInjectionFiles {

		writeReadOnlyFile(absoluteSoongInjectionDir, file)

		// The API targets in api_bp2build workspace do not have any dependency on api_bp2build.

		// But we need to create these files to prevent errors during Bazel analysis.

		// These need to be created in Read-Write mode.

		// This is because the subsequent step (bp2build in api domain analysis) creates them in Read-Write mode

		// to allow users to edit/experiment in the synthetic workspace.

		writeReadWriteFile(absoluteSoongInjectionDir, file)

	}



	workspace := shared.JoinPath(configuration.SoongOutDir(), "api_bp2build")

cmd/soong_build/queryview.go

+13 −0
Original line number Diff line number Diff line
@@ -91,6 +91,19 @@ func writeReadOnlyFile(dir string, f bp2build.BazelFile) error { 
	return err

}



func writeReadWriteFile(dir string, f bp2build.BazelFile) error {

	dir = filepath.Join(dir, f.Dir)

	if err := createDirectoryIfNonexistent(dir); err != nil {

		return err

	}

	pathToFile := filepath.Join(dir, f.Basename)



	// 0644 is read-write

	err := ioutil.WriteFile(pathToFile, []byte(f.Contents), 0644)



	return err

}



func createDirectoryIfNonexistent(dir string) error {

	if _, err := os.Stat(dir); os.IsNotExist(err) {

		return os.MkdirAll(dir, os.ModePerm)