Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fbfb59d authored Jul 09, 2021 by Paul Duffin

Extract preparer for namespace

Bug: 193228441
Test: m nothing
Change-Id: If00b0595edd48be8c8d3308b87fb920dfb0340ee

parent 1a0e2d20

android/namespace.go

+5 −1

Original line number	Diff line number	Diff line
		@@ -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

android/namespace_test.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -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.

android/testing.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -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