diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-01-26 18:27:02 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-01-26 20:21:18 -0800 |
| commit | 6e72ef722507a78320e5a07a61ccf85b513e73f2 (patch) | |
| tree | 3e1745214b4bd19a7988ebe234de403e94478a85 /android | |
| parent | ad4692d5af06b879d82f244574e710a6f4ccf93f (diff) | |
| download | build_soong-6e72ef722507a78320e5a07a61ccf85b513e73f2.tar.gz build_soong-6e72ef722507a78320e5a07a61ccf85b513e73f2.tar.bz2 build_soong-6e72ef722507a78320e5a07a61ccf85b513e73f2.zip | |
Move namespace mutator earlier to support defaults
The prebuilts and defaults mutators start adding some dependencies, so
for them to be able to reference imported modules, we need to
run the namespace mutator earlier.
Test: m nothing
Test: Try to use a global defaults module from a namespace
Change-Id: I6e853d20e32251d0fd33c8b2dcc26c0695b808fd
Diffstat (limited to 'android')
| -rw-r--r-- | android/mutator.go | 2 | ||||
| -rw-r--r-- | android/namespace_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/mutator.go b/android/mutator.go index 2f13f6ca..64d9fddb 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -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, } diff --git a/android/namespace_test.go b/android/namespace_test.go index 9ab186b0..a6fc9d59 100644 --- a/android/namespace_test.go +++ b/android/namespace_test.go @@ -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") |