Return early after NDK->non-NDK library link error am: 155d17c1da

am: 63833a3882 Change-Id: Ib83cad7611db8800e2cbee32c4a6126de8c1f472
2019-02-06 23:02:37 -08:00 · 2019-02-06 23:02:37 -08:00 · 71c27ff72b
parent 0cfd68d52a 63833a3882
commit 71c27ff72b
1 changed files with 1 additions and 0 deletions
--- a/cc/cc.go
+++ b/cc/cc.go
@ -1378,6 +1378,7 @@ func checkLinkType(ctx android.ModuleContext, from *Module, to *Module, tag depe
 		// NDK code linking to platform code is never okay.
 		ctx.ModuleErrorf("depends on non-NDK-built library %q",
 			ctx.OtherModuleName(to))
+		return
 	}

 	// At this point we know we have two NDK libraries, but we need to