commit 750024367eae01fd5559107c29e15cdde6af265d
author Dan Willemsen <dwillemsen@google.com> Tue Jan 30 00:16:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 30 00:16:13 2018 +0000
tree 905e96b73b7a8a6e7765f00a0a9043d7c069d387
parent ffe2c1c369d3647e811f65c52146ce43caec3460
parent 6e72ef722507a78320e5a07a61ccf85b513e73f2

Merge "Move namespace mutator earlier to support defaults"

android/mutator.go

diff --git a/android/mutator.go b/android/mutator.go
index 2f13f6c..64d9fdd 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -76,6 +76,7 @@
 	func(ctx RegisterMutatorsContext) {
 		ctx.TopDown("load_hooks", loadHookMutator).Parallel()
 	},
+	RegisterNamespaceMutator,
 	RegisterPrebuiltsPreArchMutators,
 	RegisterDefaultsPreArchMutators,
 }
@@ -86,7 +87,6 @@
 }
 
 var preDeps = []RegisterMutatorFunc{
-	RegisterNamespaceMutator,
 	registerArchMutator,
 }
 

android/namespace_test.go

diff --git a/android/namespace_test.go b/android/namespace_test.go
index 9ab186b..a6fc9d5 100644
--- a/android/namespace_test.go
+++ b/android/namespace_test.go
@@ -606,7 +606,7 @@
 	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")