From 15d7af5e9358fd9577061fe5f6a4b3d4c0bac117 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 3 Mar 2025 18:19:20 +0000 Subject: Disable kythe indexing of R files https://r.android.com/3207856 special-cased kythe builds to always generate R.srcjar files. Some of the R.java files are too big to be processed by kythe (b/397132972#comment43), so disable R.srcjar generation. Bug: 397132972 Test: XREF_CORPUS=blah m nothing #verified that R.srcjar is not present in .ninja files Change-Id: Ifadf6418c221adb144b10212becac1d6901e951f --- java/aar.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'java') diff --git a/java/aar.go b/java/aar.go index 0e27cb8fd..ebada655f 100644 --- a/java/aar.go +++ b/java/aar.go @@ -219,11 +219,7 @@ func (p propagateRROEnforcementTransitionMutator) Mutate(ctx android.BottomUpMut 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 { -- cgit v1.2.3-59-g8ed1b