Merge remote-tracking branch 'aosp/upstream' into master am: 88e39c0c1c
am: cfcbd29e86
am: 12612a4222
Change-Id: Ibfa0c30bf77d7b61020e2af684b77c5f99a13862
This commit is contained in:
commit
fc94ba447b
1 changed files with 4 additions and 0 deletions
|
@ -889,6 +889,10 @@ func (c *Context) MockFileSystem(files map[string][]byte) {
|
||||||
c.fs = pathtools.MockFs(files)
|
c.fs = pathtools.MockFs(files)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Context) SetFs(fs pathtools.FileSystem) {
|
||||||
|
c.fs = fs
|
||||||
|
}
|
||||||
|
|
||||||
// openAndParse opens and parses a single Blueprints file, and returns the results
|
// openAndParse opens and parses a single Blueprints file, and returns the results
|
||||||
func (c *Context) openAndParse(filename string, scope *parser.Scope, rootDir string,
|
func (c *Context) openAndParse(filename string, scope *parser.Scope, rootDir string,
|
||||||
parent *fileParseContext) (file *parser.File,
|
parent *fileParseContext) (file *parser.File,
|
||||||
|
|
Loading…
Reference in a new issue