From 1f7f70fe39137360c9983c4c702e68ebd2677807 Mon Sep 17 00:00:00 2001 From: ThiƩbaud Weksteen Date: Wed, 24 Jun 2020 11:32:48 +0200 Subject: Remove moduleContextImpl struct The moduleContextImpl structure contains duplicate information on the contexts. BaseModuleContext, ModuleContext and DepsContext can already surface which Module is being processed via Module(). Because most of the Rust-specific methods on the *Context structures simply forward to the Module methods, expose a RustModule() method. Test: cd external/rust/crates; mma Change-Id: Ifee90825d54081fc5e9a8df0b7c4580412e9158c --- rust/library.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rust/library.go') diff --git a/rust/library.go b/rust/library.go index 3c948ea09..f070c34c6 100644 --- a/rust/library.go +++ b/rust/library.go @@ -329,7 +329,7 @@ func (library *libraryDecorator) sharedLibFilename(ctx ModuleContext) string { } func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags { - flags.RustFlags = append(flags.RustFlags, "-C metadata="+ctx.baseModuleName()) + flags.RustFlags = append(flags.RustFlags, "-C metadata="+ctx.ModuleName()) flags = library.baseCompiler.compilerFlags(ctx, flags) if library.shared() || library.static() { library.includeDirs = append(library.includeDirs, android.PathsForModuleSrc(ctx, library.Properties.Include_dirs)...) -- cgit v1.2.3-59-g8ed1b