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 am: 72ae33f6fa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207856

Change-Id: I1df1b4f8b20aaff909a4838a7fd3c6d1d5cbd764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-06 17:50:53 +00:00
committed by Automerger Merge Worker
parent 9602753238 72ae33f6fa
commit 3af7b11ed0
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 {
return BoolDefault(a.aaptProperties.Use_resource_processor, ctx.Config().UseResourceProcessorByDefault()) &&
// 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 {