From 637458d3265e3f08cc42dcde3536d8775a2009b9 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Tue, 19 Sep 2023 20:09:00 +0000 Subject: 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 --- rust/library.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rust/library.go') diff --git a/rust/library.go b/rust/library.go index 3f031c10c..035708674 100644 --- a/rust/library.go +++ b/rust/library.go @@ -810,7 +810,7 @@ type rustLibraryAttributes struct { Proc_macro_deps bazel.LabelListAttribute } -func libraryBp2build(ctx android.TopDownMutatorContext, m *Module) { +func libraryBp2build(ctx android.Bp2buildMutatorContext, m *Module) { lib := m.compiler.(*libraryDecorator) srcs, compileData := srcsAndCompileDataAttrs(ctx, *lib.baseCompiler) @@ -887,7 +887,7 @@ type cargoBuildScriptAttributes struct { Version bazel.StringAttribute } -func cargoBuildScriptBp2build(ctx android.TopDownMutatorContext, m *Module) *string { +func cargoBuildScriptBp2build(ctx android.Bp2buildMutatorContext, m *Module) *string { // Soong treats some crates like libprotobuf as special in that they have // cargo build script ran to produce an out folder and check it into AOSP // For example, https://cs.android.com/android/platform/superproject/main/+/main:external/rust/crates/protobuf/out/ -- cgit v1.2.3-59-g8ed1b