From 3c316bc03bb21fa047f4db536fda8aeeba193266 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 7 Jul 2016 20:41:36 -0700 Subject: [PATCH] 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 --- cc/cc.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) {