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

Commit ea7b6c11 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Extract preparer for namespace" am: bea17eff 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1761487

Change-Id: Ie12de5c23280c133a4460fc5c814f04d91ac96f8
parents 9e36fa0e bea17eff

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