From f8b860a0fb98448dd44db835d5f146e8a50e5ef5 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 16 Apr 2019 14:43:28 -0700 Subject: 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 --- java/java_test.go | 1 - 1 file changed, 1 deletion(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 3ae993d26..89f871cb1 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -94,7 +94,6 @@ func testContext(config android.Config, bp string, ctx.PreArchMutators(android.RegisterOverridePreArchMutators) ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) { ctx.TopDown("prebuilt_apis", PrebuiltApisMutator).Parallel() - ctx.TopDown("java_sdk_library", SdkLibraryMutator).Parallel() }) ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(OverlaySingletonFactory)) ctx.RegisterPreSingletonType("sdk", android.SingletonFactoryAdaptor(sdkSingletonFactory)) -- cgit v1.2.3-59-g8ed1b