diff options
| author | Colin Cross <ccross@android.com> | 2016-05-03 21:02:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-03 21:02:44 +0000 |
| commit | 98943a0a630f77194e37bbd153d9c0ff194c2f76 (patch) | |
| tree | 98ddafc2374bca7b744e5d1d8a6ca6a66b7dad36 | |
| parent | 369f01315a669f32f741659ae9a5f5c4fb7b7fad (diff) | |
| parent | e2c487494578b2149edc84d0dd96ba425f5850f7 (diff) | |
| download | build_soong-98943a0a630f77194e37bbd153d9c0ff194c2f76.tar.gz build_soong-98943a0a630f77194e37bbd153d9c0ff194c2f76.tar.bz2 build_soong-98943a0a630f77194e37bbd153d9c0ff194c2f76.zip | |
Merge changes I2a3cd53c,I8b9de913
* changes:
Prevent replacing missing dependency glob rules with errors
Support nested glob patterns
| -rw-r--r-- | common/glob.go | 2 | ||||
| -rw-r--r-- | common/module.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/glob.go b/common/glob.go index 96655cf8..5b03bc1b 100644 --- a/common/glob.go +++ b/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 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 |