Merge changes I2a3cd53c,I8b9de913

* changes:
  Prevent replacing missing dependency glob rules with errors
  Support nested glob patterns

common/glob.go

@@ -73,7 +73,7 @@ type globContext interface {
 }
 
 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

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