diff options
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/aar.go b/java/aar.go index 7d73b03e4..41cc24a0d 100644 --- a/java/aar.go +++ b/java/aar.go @@ -483,9 +483,9 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio } linkFlags = append(linkFlags, "--no-static-lib-packages") - if a.isLibrary && a.useResourceProcessorBusyBox(ctx) { - // When building an android_library using ResourceProcessorBusyBox pass --merge-only to skip resource - // references validation until the final app link step when all static libraries are present. + if a.isLibrary { + // Pass --merge-only to skip resource references validation until the final + // app link step when when all static libraries are present. linkFlags = append(linkFlags, "--merge-only") } |