Merge "cc: clearer OS mismatch error." into main

This commit is contained in:
Treehugger Robot
2024-08-28 00:32:32 +00:00
committed by Gerrit Code Review

View File

@@ -3042,7 +3042,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
} }
if dep.Target().Os != ctx.Os() { if dep.Target().Os != ctx.Os() {
ctx.ModuleErrorf("OS mismatch between %q and %q", ctx.ModuleName(), depName) ctx.ModuleErrorf("OS mismatch between %q (%s) and %q (%s)", ctx.ModuleName(), ctx.Os().Name, depName, dep.Target().Os.Name)
return return
} }
if dep.Target().Arch.ArchType != ctx.Arch().ArchType { if dep.Target().Arch.ArchType != ctx.Arch().ArchType {