Pass ModulePath to NameInterface

To allow it to validate that the filename equals Android.bp

Bug: 65683273
Test: m -j nothing # which runs tests
Change-Id: I171dddd102590df558053b615d39c75c00b6ac6e

1 files changed, 7 insertions, 3 deletions

diff --git a/context.go b/context.go
index 481d144..30cc973 100644
--- a/context.go
+++ b/context.go
@@ -1284,7 +1284,7 @@ func (c *Context) addModule(module *moduleInfo) []error {
 	}
 	module.group = group
 	namespace, errs := c.nameInterface.NewModule(
-		&moduleCreationContextImpl{c.ModuleDir(module.logicModule)},
+		&namespaceContextImpl{c.ModulePath(module.logicModule)},
 		ModuleGroup{moduleGroup: group},
 		module.logicModule)
 	if len(errs) > 0 {
@@ -2733,9 +2733,13 @@ func (c *Context) ModuleName(logicModule Module) string {
 	return module.Name()
 }
 
-func (c *Context) ModuleDir(logicModule Module) string {
+func (c *Context) ModulePath(logicModule Module) string {
 	module := c.moduleInfo[logicModule]
-	return filepath.Dir(module.relBlueprintsFile)
+	return module.relBlueprintsFile
+}
+
+func (c *Context) ModuleDir(logicModule Module) string {
+	return filepath.Dir(c.ModulePath(logicModule))
 }
 
 func (c *Context) ModuleSubDir(logicModule Module) string {