diff options
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/aar.go b/java/aar.go index 4a60f908a..93ff7dd97 100644 --- a/java/aar.go +++ b/java/aar.go @@ -76,7 +76,7 @@ type aaptProperties struct { // list of directories relative to the Blueprints file containing // Android resources. Defaults to ["res"] if a directory called res exists. // Set to [] to disable the default. - Resource_dirs []string + Resource_dirs []string `android:"path"` // list of zip files containing Android resources. Resource_zips []string `android:"path"` @@ -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 { |