Extract preparer for namespace

Bug: 193228441
Test: m nothing
Change-Id: If00b0595edd48be8c8d3308b87fb920dfb0340ee
This commit is contained in:
Paul Duffin
2021-07-09 16:47:38 +01:00
parent 1a0e2d20b3
commit 4fbfb59d3e
3 changed files with 11 additions and 3 deletions

View File

@@ -27,7 +27,11 @@ import (
)
func init() {
RegisterModuleType("soong_namespace", NamespaceFactory)
registerNamespaceBuildComponents(InitRegistrationContext)
}
func registerNamespaceBuildComponents(ctx RegistrationContext) {
ctx.RegisterModuleType("soong_namespace", NamespaceFactory)
}
// threadsafe sorted list

View File

@@ -636,13 +636,12 @@ func setupTestFromFiles(t *testing.T, bps MockFS) (ctx *TestContext, errs []erro
result := GroupFixturePreparers(
FixtureModifyContext(func(ctx *TestContext) {
ctx.RegisterModuleType("test_module", newTestModule)
ctx.RegisterModuleType("soong_namespace", NamespaceFactory)
ctx.Context.RegisterModuleType("blueprint_test_module", newBlueprintTestModule)
ctx.PreArchMutators(RegisterNamespaceMutator)
ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) {
ctx.BottomUp("rename", renameMutator)
})
}),
PrepareForTestWithNamespace,
bps.AddToFixture(),
).
// Ignore errors for now so tests can check them later.

View File

@@ -110,6 +110,11 @@ var PrepareForTestWithLicenseDefaultModules = GroupFixturePreparers(
FixtureAddFile("build/soong/licenses/LICENSE", nil),
)
var PrepareForTestWithNamespace = FixtureRegisterWithContext(func(ctx RegistrationContext) {
registerNamespaceBuildComponents(ctx)
ctx.PreArchMutators(RegisterNamespaceMutator)
})
// Test fixture preparer that will register most java build components.
//
// Singletons and mutators should only be added here if they are needed for a majority of java