Fix SDK link type check

This was always returning true, which defeats the point. Fix the check,
then add another exception for NDK libraries.

Change-Id: I139d95ef62d1063c083d6381293072ad3277ae74
This commit is contained in:
Dan Willemsen 2016-07-07 20:41:36 -07:00
parent 6871062821
commit 3c316bc03b

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) {