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

Commit 4a93b0ea authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Move namespace mutator earlier to support defaults" 

am: 75002436

Change-Id: I847c756fa7be5d75d09b9b2e70577b09b4ecec42
parents f522b991 75002436

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")