aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-04-27 13:47:35 -0700
committerColin Cross <ccross@android.com>2016-04-27 13:47:35 -0700
commite2c487494578b2149edc84d0dd96ba425f5850f7 (patch)
treebd399466d541c01fc2c3915cd5595862eeb73db0
parentda727cf9919e17051f8e6683db5efd4b692c3153 (diff)
downloadbuild_soong-e2c487494578b2149edc84d0dd96ba425f5850f7.tar.gz
build_soong-e2c487494578b2149edc84d0dd96ba425f5850f7.tar.bz2
build_soong-e2c487494578b2149edc84d0dd96ba425f5850f7.zip
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
-rw-r--r--common/module.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/module.go b/common/module.go
index ee028da1..f3f1263a 100644
--- a/common/module.go
+++ b/common/module.go
@@ -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