Prevent replacing missing dependency glob rules with errors

AndroidModuleContext.Build() replaces all build statements with errors
when the module has missing dependencies, but modules may try to create
glob rules to detect when missing dependencies have been satisified, and
those rules should not be replaced with errors.  Whitelist globRule
build statements.

Change-Id: I2a3cd53c05cea44cec9b5a99090d8778ca954d69
This commit is contained in:
Colin Cross
2016-04-27 13:47:35 -07:00
parent da727cf991
commit e2c4874945

View File

@@ -440,7 +440,7 @@ func (a *androidModuleContext) ninjaError(outputs []string, err error) {
}
func (a *androidModuleContext) Build(pctx blueprint.PackageContext, params blueprint.BuildParams) {
if a.missingDeps != nil {
if a.missingDeps != nil && params.Rule != globRule {
a.ninjaError(params.Outputs, fmt.Errorf("module %s missing dependencies: %s\n",
a.ModuleName(), strings.Join(a.missingDeps, ", ")))
return