diff options
author | 2019-02-06 18:30:02 -0800 | |
---|---|---|
committer | 2019-02-06 18:30:02 -0800 | |
commit | 155d17c1da6da9cde02cd2850b4a85aba322684c (patch) | |
tree | 970d4a361f03ff513e78b83f0be227c38038acd1 | |
parent | 3a984f55f64ecbababa7a274d768d9d365c81fa5 (diff) |
Return early after NDK->non-NDK library link error
Otherwise the code after this assumes that the "to" library is an NDK
library and panics when it isn't.
Bug: 124019854
Test: trigger error, no longer see panic
Change-Id: I88d10e8d882285e24b4f42d0cf85c2d658348617
-rw-r--r-- | cc/cc.go | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |