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

Commit 96ae1409 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Disable use_resource_processor when producing a shared library" into main

parents 25900543 eee4ab12

java/aar.go

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,9 @@ func propagateRROEnforcementMutator(ctx android.TopDownMutatorContext) { 
}



func (a *aapt) useResourceProcessorBusyBox(ctx android.BaseModuleContext) bool {

	return BoolDefault(a.aaptProperties.Use_resource_processor, ctx.Config().UseResourceProcessorByDefault())

	return BoolDefault(a.aaptProperties.Use_resource_processor, ctx.Config().UseResourceProcessorByDefault()) &&

		// TODO(b/331641946): remove this when ResourceProcessorBusyBox supports generating shared libraries.

		!slices.Contains(a.aaptProperties.Aaptflags, "--shared-lib")

}



func (a *aapt) filterProduct() string {