diff options
author | Patrice Arruda <patricearruda@google.com> | 2019-03-08 18:10:11 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-08 18:10:11 -0800 |
commit | 4fd7ad26c221ecfe1844c99044e56e380c3a364f (patch) | |
tree | d86bacf48300844a69e546c5008d40094b8d4ec4 | |
parent | 428ebae61ac78ce5b25a777db4a02a5b3f6db927 (diff) | |
parent | 8610dfd44168b5dc5236e96440713fcc021cf6d3 (diff) | |
download | blueprint-4fd7ad26c221ecfe1844c99044e56e380c3a364f.tar.gz |
Merge remote-tracking branch 'aosp/upstream' into merge_upstream
am: 8610dfd441
Change-Id: I14122e616dc1c4dde85264933f91144c7170eb88
-rw-r--r-- | context.go | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -604,15 +604,6 @@ type fileParseContext struct { doneVisiting chan struct{} } -func (c *Context) ParseBlueprintsFiles(rootFile string) (deps []string, errs []error) { - baseDir := filepath.Dir(rootFile) - pathsToParse, err := c.ListModulePaths(baseDir) - if err != nil { - return nil, []error{err} - } - return c.ParseFileList(baseDir, pathsToParse) -} - // ParseBlueprintsFiles parses a set of Blueprints files starting with the file // at rootFile. When it encounters a Blueprints file with a set of subdirs // listed it recursively parses any Blueprints files found in those @@ -622,6 +613,15 @@ func (c *Context) ParseBlueprintsFiles(rootFile string) (deps []string, errs []e // which the future output will depend is returned. This list will include both // Blueprints file paths as well as directory paths for cases where wildcard // subdirs are found. +func (c *Context) ParseBlueprintsFiles(rootFile string) (deps []string, errs []error) { + baseDir := filepath.Dir(rootFile) + pathsToParse, err := c.ListModulePaths(baseDir) + if err != nil { + return nil, []error{err} + } + return c.ParseFileList(baseDir, pathsToParse) +} + func (c *Context) ParseFileList(rootDir string, filePaths []string) (deps []string, errs []error) { |