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

Commit eee4ab12 authored by Colin Cross's avatar Colin Cross
Browse files

Disable use_resource_processor when producing a shared library 

Passing --shared-lib to aapt2 causes it to add an extra
onResourcesLoaded method that rewrites resources IDs to include
the package ID determined at runtime.  ResourceProcessorBusyBox
has no equivalent functionality, so disable whenever --shared-lib
is found in aaptflags for now.

Fixes: 330646473
Bug: 331641946
Test: manual
Change-Id: Ibb0c2c7bf7a41ab294f5c84b4b6018cc8a63b0f4
parent ddde9e29

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 {