Fix SDK link type check am: 3c316bc03b

am: 5ff2a27e89

Change-Id: I43240ee1b84691d57ba72853c8cd43935ed7a1f3
This commit is contained in:
Dan Willemsen
2016-07-08 16:54:15 +00:00
committed by android-build-merger

View File

@@ -928,7 +928,11 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
// These are allowed, but don't set sdk_version
return true
}
return from.Properties.Sdk_version != ""
if _, ok := to.linker.(*ndkPrebuiltStlLinker); ok {
// These are allowed, but don't set sdk_version
return true
}
return to.Properties.Sdk_version != ""
}
ctx.VisitDirectDeps(func(m blueprint.Module) {