diff options
| author | 2020-08-10 12:11:16 +0000 | |
|---|---|---|
| committer | 2020-08-10 12:11:16 +0000 | |
| commit | a57e56a684cb0d250a4f9060c59f7cc5ae607ec3 (patch) | |
| tree | bd7c1233a53267286ffac914d711625ab3e0105a /rust/rust.go | |
| parent | 95647739aa7a7d926d1379e51a5311746e4c7ae8 (diff) | |
| parent | c7767922e06fd6513e0b1e6846a21dfe44df8823 (diff) | |
Merge "Export Rust SourceProvider types and methods"
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rust/rust.go b/rust/rust.go index 113b0b262..17fd04225 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -83,7 +83,7 @@ type Module struct { clippy *clippy cachedToolchain config.Toolchain sourceProvider SourceProvider - subAndroidMkOnce map[subAndroidMkProvider]bool + subAndroidMkOnce map[SubAndroidMkProvider]bool outputFile android.OptionalPath generatedFile android.OptionalPath @@ -537,7 +537,7 @@ func (mod *Module) Init() android.Module { mod.AddProperties(mod.clippy.props()...) } if mod.sourceProvider != nil { - mod.AddProperties(mod.sourceProvider.sourceProviderProps()...) + mod.AddProperties(mod.sourceProvider.SourceProviderProps()...) } android.InitAndroidArchModule(mod, mod.hod, mod.multilib) @@ -671,10 +671,10 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { flags, deps = mod.clippy.flags(ctx, flags, deps) } - // SourceProvider needs to call generateSource() before compiler calls compile() so it can provide the source. + // SourceProvider needs to call GenerateSource() before compiler calls compile() so it can provide the source. // TODO(b/162588681) This shouldn't have to run for every variant. if mod.sourceProvider != nil { - generatedFile := mod.sourceProvider.generateSource(ctx, deps) + generatedFile := mod.sourceProvider.GenerateSource(ctx, deps) mod.generatedFile = android.OptionalPathForPath(generatedFile) mod.sourceProvider.setSubName(ctx.ModuleSubDir()) } @@ -696,7 +696,7 @@ func (mod *Module) deps(ctx DepsContext) Deps { deps = mod.compiler.compilerDeps(ctx, deps) } if mod.sourceProvider != nil { - deps = mod.sourceProvider.sourceProviderDeps(ctx, deps) + deps = mod.sourceProvider.SourceProviderDeps(ctx, deps) } if mod.coverage != nil { |