| commit | 3b72295e02986a3341998b02b97f32aa8b283fa7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 13 22:30:21 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 13 22:30:22 2016 +0000 |
| tree | eb00aa81f911dc4aa52f315cd21c8be56ba5f57f | |
| parent | 14ed26d6cd4175c8bf7381b24fdf888f658f0085 [diff] | |
| parent | a8f5e9a8b27e262c029443c6de0ae6ba0e1bca7f [diff] |
Merge "Allow disabled dependencies when SOONG_ALLOW_MISSING_DEPENDENCIES is set"
diff --git a/cc/cc.go b/cc/cc.go index 6525047..0ea4713 100644 --- a/cc/cc.go +++ b/cc/cc.go
@@ -834,7 +834,11 @@ } if !a.Enabled() { - ctx.ModuleErrorf("depends on disabled module %q", name) + if ctx.AConfig().AllowMissingDependencies() { + ctx.AddMissingDependencies([]string{name}) + } else { + ctx.ModuleErrorf("depends on disabled module %q", name) + } return }