diff options
| author | 2023-09-19 20:09:00 +0000 | |
|---|---|---|
| committer | 2023-09-20 14:49:35 +0000 | |
| commit | 637458d3265e3f08cc42dcde3536d8775a2009b9 (patch) | |
| tree | e3a34a4757f85a052f91de5b4e7e23cc74408433 /rust/rust.go | |
| parent | 9e12c7863726889853d12d8dea2bf7574b96133e (diff) | |
Have ConvertWBp2build use Bp2buildMutatorContext
This no-op refactoring facilitates some upcoming functional changes for
"bp2build allowlist v2". The work requires that the bp2build conversion
mutator be changed from a TopDown mutator to a BottomUp mutator.
Refactoring all bp2build-related methods so that they use Bp2buildMutatorContext
makes it easier to make this functional change without touching tens of
files and multiple projects.
Bug: 285631638
Test: m bp2build
Change-Id: I3d1ef3064146e959c6f0dc315350fc9764bf2bd2
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rust/rust.go b/rust/rust.go index 1ee99cdb1..3b2448493 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -15,11 +15,12 @@ package rust import ( + "fmt" + "strings" + "android/soong/bazel" "android/soong/bloaty" "android/soong/ui/metrics/bp2build_metrics_proto" - "fmt" - "strings" "github.com/google/blueprint" "github.com/google/blueprint/proptools" @@ -1845,7 +1846,7 @@ func (c *Module) Partition() string { return "" } -func (m *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) { +func (m *Module) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) { if ctx.ModuleType() == "rust_library_host" || ctx.ModuleType() == "rust_library" { libraryBp2build(ctx, m) } else if ctx.ModuleType() == "rust_proc_macro" { @@ -1864,7 +1865,7 @@ func (m *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) { // TODO(b/297344471): When crate_root prop is set which enforces inputs sandboxing, // always use `srcs` and `compile_data` props to generate `srcs` and `compile_data` attributes // instead of using globs. -func srcsAndCompileDataAttrs(ctx android.TopDownMutatorContext, c baseCompiler) (bazel.LabelList, bazel.LabelList) { +func srcsAndCompileDataAttrs(ctx android.Bp2buildMutatorContext, c baseCompiler) (bazel.LabelList, bazel.LabelList) { var srcs bazel.LabelList var compileData bazel.LabelList |