Merge "Disable kythe indexing of R files" into main
diff --git a/java/aar.go b/java/aar.go
index 0e27cb8..ebada65 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -219,11 +219,7 @@
func (a *aapt) useResourceProcessorBusyBox(ctx android.BaseModuleContext) bool {
return BoolDefault(a.aaptProperties.Use_resource_processor, true) &&
// TODO(b/331641946): remove this when ResourceProcessorBusyBox supports generating shared libraries.
- !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()
+ !slices.Contains(a.aaptProperties.Aaptflags, "--shared-lib")
}
func (a *aapt) filterProduct() string {