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

Commit c55f3450 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Shorten missing module panic message" am: 0fe22f4b

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

Change-Id: I19a117319d751a332f303344a3580a266982c327
parents e22ef09f 0fe22f4b
Loading
Loading
Loading
Loading
+15 −5
Original line number Diff line number Diff line
@@ -119,14 +119,24 @@ func (ctx *TestContext) ModuleForTests(name, variant string) TestingModule {

	if module == nil {
		// find all the modules that do exist
		allModuleNames := []string{}
		var allModuleNames []string
		var allVariants []string
		ctx.VisitAllModules(func(m blueprint.Module) {
			allModuleNames = append(allModuleNames, m.(Module).Name()+"("+ctx.ModuleSubDir(m)+")")
			allModuleNames = append(allModuleNames, ctx.ModuleName(m))
			if ctx.ModuleName(m) == name {
				allVariants = append(allVariants, ctx.ModuleSubDir(m))
			}
		})
		sort.Strings(allModuleNames)
		sort.Strings(allVariants)

		panic(fmt.Errorf("failed to find module %q variant %q. All modules:\n  %s",
			name, variant, strings.Join(allModuleNames, "\n  ")))
		if len(allVariants) == 0 {
			panic(fmt.Errorf("failed to find module %q. All modules:\n  %s",
				name, strings.Join(allModuleNames, "\n  ")))
		} else {
			panic(fmt.Errorf("failed to find module %q variant %q. All variants:\n  %s",
				name, variant, strings.Join(allVariants, "\n  ")))
		}
	}

	return TestingModule{module}