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

Commit 00543dc6 authored by Liz Kammer's avatar Liz Kammer
Browse files

Handle bad rename 

Cleanspec wasn't working, so let's handle it in Soong

Test: create an invalid file, run m nothing, verify it is removed
Change-Id: I55d3c9344541b8e504887225a660044e14204427
parent 5d982b39

cmd/soong_ui/main.go

+26 −0
Original line number Diff line number Diff line
@@ -289,12 +289,38 @@ func logAndSymlinkSetup(buildCtx build.Context, config build.Config) { 
		}

	}



	removeBadTargetRename(buildCtx, config)



	// Create a source finder.

	f := build.NewSourceFinder(buildCtx, config)

	defer f.Shutdown()

	build.FindSources(buildCtx, config, f)

}



func removeBadTargetRename(ctx build.Context, config build.Config) {

	log := ctx.ContextImpl.Logger

	// find bad paths

	m, err := filepath.Glob(filepath.Join(config.OutDir(), "bazel", "output", "execroot", "__main__", "bazel-out", "mixed_builds_product-*", "bin", "tools", "metalava", "metalava"))

	if err != nil {

		log.Fatalf("Glob for invalid file failed %s", err)

	}

	for _, f := range m {

		info, err := os.Stat(f)

		if err != nil {

			log.Fatalf("Stat of invalid file %q failed %s", f, err)

		}

		// if it's a directory, leave it, but remove the files

		if !info.IsDir() {

			err = os.Remove(f)

			if err != nil {

				log.Fatalf("Remove of invalid file %q failed %s", f, err)

			} else {

				log.Verbosef("Removed %q", f)

			}

		}

	}

}



func dumpVar(ctx build.Context, config build.Config, args []string) {

	logAndSymlinkSetup(ctx, config)

	flags := flag.NewFlagSet("dumpvar", flag.ExitOnError)