StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move namespace mutator earlier to support defaults" am: 750024367e am: 4a93b0ea47

Browse Source 
am: 73b2c92b82

Change-Id: I1910c4cff1d30d31c17a7c030dc55b58820580b7
This commit is contained in:
Dan Willemsen
2018-01-30 00:41:35 +00:00
committed by android-build-merger
parent 6b37d18bda 73b2c92b82
commit 8d7322a396
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/mutator.go
View File

@@ -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,
}

2
android/namespace_test.go
View File

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