summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2025-03-03 18:19:20 +0000
committer Spandan Das <spandandas@google.com> 2025-03-03 18:24:55 +0000
commit15d7af5e9358fd9577061fe5f6a4b3d4c0bac117 (patch)
tree4218ca490b4597dce758dedc37ea01f327eb170c
parenta6ef795f375f5249d70b94f90070adf567e7f388 (diff)
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
-rw-r--r--java/aar.go6
1 files changed, 1 insertions, 5 deletions
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 {