Merge remote-tracking branch 'aosp/upstream' into master

am: 88e39c0c1c Change-Id: Ib75816fe43d1aaaa9d71f817459e1d3cedf4b199
2019-12-18 11:50:01 -08:00 · 2019-12-18 11:50:01 -08:00 · cfcbd29e86
commit cfcbd29e86
parent 62aa0764a6 88e39c0c1c
1 changed files with 4 additions and 0 deletions
--- a/context.go
+++ b/context.go
@ -889,6 +889,10 @@ func (c *Context) MockFileSystem(files map[string][]byte) {
 	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
 func (c *Context) openAndParse(filename string, scope *parser.Scope, rootDir string,
 	parent *fileParseContext) (file *parser.File,