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

Commit 534f1570 authored by Rupert Shuttleworth's avatar Rupert Shuttleworth
Browse files

Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist. 

Test: DIST_DIR=/tmp/foo USE_BAZEL=1 m dist and DIST_DIR=/tmp/foo USE_BAZEL=1 m dist installclean
Change-Id: Ibf576d2f3ba506e0f45c30a5dbea69de5c475c9a
parent c7ed779e

cmd/soong_ui/main.go

+7 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ func main() { 


	build.SetupOutDir(buildCtx, config)



	if config.UseBazel() {

	if config.UseBazel() && config.Dist() {

		defer populateExternalDistDir(buildCtx, config)

	}
@@ -547,6 +547,12 @@ func populateExternalDistDir(ctx build.Context, config build.Config) { 
		return

	}



	// Make sure the internal DIST_DIR actually exists before trying to read from it

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

		ctx.Println("Skipping Bazel dist dir migration - nothing to do!")

		return

	}



	// Make sure the external DIST_DIR actually exists before trying to write to it

	if err = os.MkdirAll(externalDistDirPath, 0755); err != nil {

		ctx.Fatalf("Unable to make directory %s: %s", externalDistDirPath, err)