StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid duplicate module names in the error from ModuleForTests."

Browse Source
This commit is contained in:
Treehugger Robot
2021-09-10 09:15:06 +00:00
committed by Gerrit Code Review
parent 6afa749d1d 98e0d88aac
commit eee562f950
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/testing.go
View File

@@ -509,12 +509,11 @@ func (ctx *TestContext) ModuleForTests(name, variant string) TestingModule {
allVariants = append(allVariants, ctx.ModuleSubDir(m)) allVariants = append(allVariants, ctx.ModuleSubDir(m))
} }
}) })
sort.Strings(allModuleNames)
sort.Strings(allVariants) sort.Strings(allVariants)
if len(allVariants) == 0 { if len(allVariants) == 0 {
panic(fmt.Errorf("failed to find module %q. All modules:\n %s", panic(fmt.Errorf("failed to find module %q. All modules:\n %s",
name, strings.Join(allModuleNames, "\n "))) name, strings.Join(SortedUniqueStrings(allModuleNames), "\n ")))
} else { } else {
panic(fmt.Errorf("failed to find module %q variant %q. All variants:\n %s", panic(fmt.Errorf("failed to find module %q variant %q. All variants:\n %s",
name, variant, strings.Join(allVariants, "\n "))) name, variant, strings.Join(allVariants, "\n ")))