StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I2a3cd53c,I8b9de913 am: 98943a0a63

Browse Source 
am: b7130dbf91

* commit 'b7130dbf918b94eefd3ff9f92ebb0d95a8c14872':
  Prevent replacing missing dependency glob rules with errors
  Support nested glob patterns

Change-Id: I9c4cce71cd07fbb5274f052091c78d0c598be2ca
This commit is contained in:
Colin Cross
2016-05-03 21:10:27 +00:00
committed by android-build-merger
parent bcbda3935e b7130dbf91
commit 1d98d958b3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/glob.go
View File

@@ -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

2
common/module.go
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