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

Commit 7e6a9012 authored by Colin Cross's avatar Colin Cross
Browse files

Fix data race in propagateRROEnforcementMutator 

propagateRROEnforcementMutator walks dependencies of each module and
modifies them via SetRROEnforcedForDependent.  That is unsafe in a
parallel mutator, as the same dependency could be being visited by
two parent modules at the same time.  Don't mark it as a parallel
mutator.

Test: go test -race ./...
Change-Id: I9870aaa7d165bf72b751e3ceff5a2a3eb4d74ec4
parent b8282134

java/aar.go

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 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()

		ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator)

	})

}