diff options
| author | 2022-05-04 15:19:37 +0000 | |
|---|---|---|
| committer | 2022-05-04 15:19:37 +0000 | |
| commit | be4c7eda0863bb79f3fe0dc9b6b0cd9c2b33185b (patch) | |
| tree | 1538690dfad52acde43490e2f3fcffd313eb162f /java/base.go | |
| parent | 28ba9c472fd6e90d095fb90d0a1c400787fd0f1d (diff) | |
| parent | f5d91bb3b4cb907a4fbcd1ea6cf36b9d1a3094ed (diff) | |
Merge "Revert "Don't add `uses_libs`/`optional_uses_libs` to the manifest_fixer.""
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/base.go b/java/base.go index ff1ce8516..e60e54ec1 100644 --- a/java/base.go +++ b/java/base.go @@ -724,8 +724,10 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { if component, ok := dep.(SdkLibraryComponentDependency); ok { if lib := component.OptionalSdkLibraryImplementation(); lib != nil { // Add library as optional if it's one of the optional compatibility libs. - optional := android.InList(*lib, dexpreopt.OptionalCompatUsesLibs) - tag := makeUsesLibraryDependencyTag(dexpreopt.AnySdkVersion, optional, true) + tag := usesLibReqTag + if android.InList(*lib, dexpreopt.OptionalCompatUsesLibs) { + tag = usesLibOptTag + } ctx.AddVariationDependencies(nil, tag, *lib) } } |