Merge "Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist." (e808dae1) · Commits · e / os / android_build_soong

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)