diff --git a/java/aar.go b/java/aar.go index 186289e02..5c8287260 100644 --- a/java/aar.go +++ b/java/aar.go @@ -166,7 +166,11 @@ func propagateRROEnforcementMutator(ctx android.TopDownMutatorContext) { func (a *aapt) useResourceProcessorBusyBox(ctx android.BaseModuleContext) bool { 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") + !slices.Contains(a.aaptProperties.Aaptflags, "--shared-lib") && + // Use the legacy resource processor in kythe builds. + // The legacy resource processor creates an R.srcjar, which kythe can use for generating crossrefs. + // TODO(b/354854007): Re-enable BusyBox in kythe builds + !ctx.Config().EmitXrefRules() } func (a *aapt) filterProduct() string {