Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ba70d6 authored by Paul Duffin's avatar Paul Duffin
Browse files

Register the propagateRROEnforcementMutator 

This adds the registration of the mutator to the existing register...
method which will include it in PrepareForTestWithJavaBuildComponents.

Bug: 182885307
Test: m nothing
Change-Id: I6cea716a3ff4d8abdb80543b7e0ddf22246ffa30
parent 42da69d7

java/aar.go

+3 −4
Original line number Diff line number Diff line
@@ -40,15 +40,14 @@ type AndroidLibraryDependency interface { 


func init() {

	RegisterAARBuildComponents(android.InitRegistrationContext)



	android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {

		ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()

	})

}



func RegisterAARBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("android_library_import", AARImportFactory)

	ctx.RegisterModuleType("android_library", AndroidLibraryFactory)

	ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {

		ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()

	})

}



//

java/java_test.go

+0 −4
Original line number Diff line number Diff line
@@ -126,10 +126,6 @@ func testContext(config android.Config) *android.TestContext { 
	// Register module types and mutators from cc needed for JNI testing

	cc.RegisterRequiredBuildComponentsForTest(ctx)



	ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {

		ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel()

	})



	return ctx

}