diff options
| author | 2025-03-03 13:34:30 -0800 | |
|---|---|---|
| committer | 2025-03-03 13:34:30 -0800 | |
| commit | a04cc784d10482032a7e1d45a6ee63857751e1c6 (patch) | |
| tree | a26190d7413501aa3e9d85d357eb3fe89569cab0 | |
| parent | e6e550615a14b492522bc4dc8fabc08ca8931801 (diff) | |
| parent | 5015bae648ecb8d9a3fd956b3c4ec791cc2ee9ab (diff) | |
Merge "Disable kythe indexing of R files" into main am: 08a9ec8b25 am: 5015bae648
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3520830
Change-Id: I2ecccad46768b45cf4ca2bf68fe5dcbc4798783f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | java/aar.go | 6 |
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 { |