Merge remote-tracking branch 'aosp/upstream' into merge_upstream am: 8610dfd441 am: 4fd7ad26c2

am: dcf31d03f4

Change-Id: I00472e469f0213e4db0f52039f682f2a2bb48c5c

1 files changed, 9 insertions, 9 deletions

diff --git a/context.go b/context.go
index 3cd165a..324d1ec 100644
--- a/context.go
+++ b/context.go
@@ -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) {