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

Merge changes I2a3cd53c,I8b9de913 am: 98943a0a63 am: b7130dbf91

Browse Source 
am: 1d98d958b3

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

Change-Id: Idde4c2600ccfb9308cadf3330c48741a6a12362d
This commit is contained in:
Colin Cross
2016-05-03 21:12:46 +00:00
committed by android-build-merger
parent c279bc340c 1d98d958b3
commit badd0a299d
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) { 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" depFile := fileListFile + ".d"
// Get a globbed file list, and write out fileListFile and depFile // 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) { 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.ninjaError(params.Outputs, fmt.Errorf("module %s missing dependencies: %s\n",
a.ModuleName(), strings.Join(a.missingDeps, ", "))) a.ModuleName(), strings.Join(a.missingDeps, ", ")))
return return