Merge "Allow disabled dependencies when SOONG_ALLOW_MISSING_DEPENDENCIES is set"

am: 3b72295e02

Change-Id: I302841f1a97f91496678b3aac576c69952cc3f30
This commit is contained in:
Colin Cross
2016-12-13 22:34:36 +00:00
committed by android-build-merger

View File

@@ -834,7 +834,11 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
}
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
}