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

Commit 75002436 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Move namespace mutator earlier to support defaults"

parents ffe2c1c3 6e72ef72

android/mutator.go

+1 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ var preArch = []RegisterMutatorFunc{ 
	func(ctx RegisterMutatorsContext) {

		ctx.TopDown("load_hooks", loadHookMutator).Parallel()

	},

	RegisterNamespaceMutator,

	RegisterPrebuiltsPreArchMutators,

	RegisterDefaultsPreArchMutators,

}
@@ -86,7 +87,6 @@ func registerArchMutator(ctx RegisterMutatorsContext) { 
}



var preDeps = []RegisterMutatorFunc{

	RegisterNamespaceMutator,

	registerArchMutator,

}

android/namespace_test.go

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ func setupTestFromFiles(bps map[string][]byte) (ctx *TestContext, errs []error) 
	ctx.MockFileSystem(bps)

	ctx.RegisterModuleType("test_module", ModuleFactoryAdaptor(newTestModule))

	ctx.RegisterModuleType("soong_namespace", ModuleFactoryAdaptor(NamespaceFactory))

	ctx.PreDepsMutators(RegisterNamespaceMutator)

	ctx.PreArchMutators(RegisterNamespaceMutator)

	ctx.Register()



	_, errs = ctx.ParseBlueprintsFiles("Android.bp")