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

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

Merge "cc: clearer OS mismatch error." into main am: 4e3486b0 

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



Change-Id: I9f380e8a33ad8e6e8c2164e01af1580e1c3dc83b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72acf7fd 4e3486b0

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -3042,7 +3042,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
		}



		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

		}

		if dep.Target().Arch.ArchType != ctx.Arch().ArchType {