diff options
Diffstat (limited to 'java/android_manifest.go')
| -rw-r--r-- | java/android_manifest.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index 1f7234d13..38065f153 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -71,7 +71,9 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext args = append(args, "--use-embedded-dex") } - requiredUsesLibs, optionalUsesLibs := classLoaderContexts.UsesLibs() + // manifest_fixer should add only the implicit SDK libraries inferred by Soong, not those added + // explicitly via `uses_libs`/`optional_uses_libs`. + requiredUsesLibs, optionalUsesLibs := classLoaderContexts.ImplicitUsesLibs() for _, usesLib := range requiredUsesLibs { args = append(args, "--uses-library", usesLib) } |