diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-07-07 20:41:36 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-07-07 21:38:29 -0700 |
| commit | 3c316bc03bb21fa047f4db536fda8aeeba193266 (patch) | |
| tree | 76bafceabe7b2943e1f2b4431605a55d22c7b60f /cc | |
| parent | 687106282174c1ffc2d3b22eabb3e537aa20a728 (diff) | |
| download | build_soong-3c316bc03bb21fa047f4db536fda8aeeba193266.tar.gz build_soong-3c316bc03bb21fa047f4db536fda8aeeba193266.tar.bz2 build_soong-3c316bc03bb21fa047f4db536fda8aeeba193266.zip | |
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
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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) { |