diff options
| author | Colin Cross <ccross@android.com> | 2024-03-27 22:22:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 22:22:25 +0000 |
| commit | 96ae1409897fb16b8fc45bd90a0b71f4c70a3ba2 (patch) | |
| tree | 8c9a1870407706fb0bc80a3bc1909f225739644a | |
| parent | 25900543331a1508110da4926ca45557b4c236da (diff) | |
| parent | eee4ab12fad3ac6d2663ab5b6f3537eab54448e9 (diff) | |
| download | soong-96ae1409897fb16b8fc45bd90a0b71f4c70a3ba2.tar.gz | |
Merge "Disable use_resource_processor when producing a shared library" into main
| -rw-r--r-- | java/aar.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index 1734da945..1c03594be 100644 --- a/java/aar.go +++ b/java/aar.go @@ -164,7 +164,9 @@ func propagateRROEnforcementMutator(ctx android.TopDownMutatorContext) { } 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. + !slices.Contains(a.aaptProperties.Aaptflags, "--shared-lib") } func (a *aapt) filterProduct() string { |