openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes I2a3cd53c,I8b9de913 

am: 98943a0a63

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

Change-Id: I014471de0969ccb2363994120f1b6b6fc837ace1
This commit is contained in:
Colin Cross 2016-05-03 21:07:59 +00:00 committed by android-build-merger
parent 0c5c7731e4 98943a0a63
commit b7130dbf91
2 changed files with 2 additions and 2 deletions
Show Stats 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