StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable ResourceProcessorBusyBox in kythe builds" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-06 17:34:36 +00:00
committed by Gerrit Code Review
parent 29207b57cf a62d9563b4
commit 72ae33f6fa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/aar.go
View File

@@ -166,7 +166,11 @@ func propagateRROEnforcementMutator(ctx android.TopDownMutatorContext) {
func (a *aapt) useResourceProcessorBusyBox(ctx android.BaseModuleContext) bool { func (a *aapt) useResourceProcessorBusyBox(ctx android.BaseModuleContext) bool {
return BoolDefault(a.aaptProperties.Use_resource_processor, ctx.Config().UseResourceProcessorByDefault()) && return BoolDefault(a.aaptProperties.Use_resource_processor, ctx.Config().UseResourceProcessorByDefault()) &&
// TODO(b/331641946): remove this when ResourceProcessorBusyBox supports generating shared libraries. // 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 { func (a *aapt) filterProduct() string {