diff options
| author | 2020-08-05 06:36:19 -0700 | |
|---|---|---|
| committer | 2020-08-06 15:50:27 -0700 | |
| commit | c7767922e06fd6513e0b1e6846a21dfe44df8823 (patch) | |
| tree | ff0e976cd72b6fc1e48821ea0d061575691fc363 /rust/rust.go | |
| parent | d13b308960022f16651c8e1e92cef76c332e301d (diff) | |
Export Rust SourceProvider types and methods
The AIDL compiler now uses SourceProvider to compiler the generated Rust
code from system/tools/aidl/build/aidl_interface.go using its own
SourceProvider object, which needs access to baseSourceProvider and all
methods of SourceProvider.
Test: mmma system/tools/aidl with 1357705 applied
Change-Id: I226609a7fccca2e7e1bfbad5d69d1821d37e43a1
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 7ec2d736b..e56a6ae26 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 { |