diff --git a/cc/cc.go b/cc/cc.go index 66b7b4f25..8206912b3 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -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) {