Merge "Move shell and python scripts to scripts/ directory"
diff --git a/common/glob.go b/common/glob.go
index 96655cf..5b03bc1 100644
--- a/common/glob.go
+++ b/common/glob.go
@@ -73,7 +73,7 @@
}
func Glob(ctx globContext, outDir string, globPattern string, excludes []string) ([]string, error) {
- fileListFile := filepath.Join(outDir, "glob", globToString(globPattern))
+ fileListFile := filepath.Join(outDir, "glob", globToString(globPattern)+".glob")
depFile := fileListFile + ".d"
// Get a globbed file list, and write out fileListFile and depFile
diff --git a/common/module.go b/common/module.go
index ee028da..f3f1263 100644
--- a/common/module.go
+++ b/common/module.go
@@ -440,7 +440,7 @@
}
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