diff options
| author | 2019-04-16 14:43:28 -0700 | |
|---|---|---|
| committer | 2019-04-16 21:46:28 +0000 | |
| commit | f8b860a0fb98448dd44db835d5f146e8a50e5ef5 (patch) | |
| tree | dd9e592e116916035dcfc5b84552a5ffef5139cf /sysprop/sysprop_test.go | |
| parent | 819635624843ae286cefae6a9a89d3d90ed61cd8 (diff) | |
Use LoadHook to create modules in java_sdk_library
Creating new modules in a mutator is dangerous, as other mutators
that need to see the new modules may already have run, in this case
the prebuilts mutator. Move SdkLibraryMutator to a LoadHook instead.
Also moves registering the LoadHook mutator to testing.go so it is
registered for all tests.
Test: m checkbuild
Change-Id: I08bd76a0e6205d2ca27861058067a1562c339eed
Diffstat (limited to 'sysprop/sysprop_test.go')
| -rw-r--r-- | sysprop/sysprop_test.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index af89c242d..e90519ed0 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -61,15 +61,11 @@ func testContext(config android.Config, bp string, ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(java.LibraryFactory)) ctx.RegisterModuleType("java_system_modules", android.ModuleFactoryAdaptor(java.SystemModulesFactory)) ctx.RegisterModuleType("prebuilt_apis", android.ModuleFactoryAdaptor(java.PrebuiltApisFactory)) - ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) { - ctx.TopDown("load_hooks", android.LoadHookMutator).Parallel() - }) ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) { ctx.TopDown("prebuilt_apis", java.PrebuiltApisMutator).Parallel() - ctx.TopDown("java_sdk_library", java.SdkLibraryMutator).Parallel() }) ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(cc.LibraryFactory)) |