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

Commit 713b5010 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Register the propagateRROEnforcementMutator"

parents c29088b7 04ba70d6
Loading
Loading
Loading
Loading
+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()
	})
}

//
+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
}