diff options
| author | 2022-05-04 16:38:28 +0000 | |
|---|---|---|
| committer | 2022-05-04 16:38:28 +0000 | |
| commit | eb89a79400dc49af1847435a68207a8b55b47a1f (patch) | |
| tree | 6ee9354ddbaf33643b2404f4f86d77ee7c970662 /java/base.go | |
| parent | 2737d913936c2124c9a57a31ff86052af195d7fe (diff) | |
| parent | b20002cdeb9c7061c04771f74167282c05aeff0d (diff) | |
Merge "Revert "Don't add `uses_libs`/`optional_uses_libs` to the manifest_fixer."" am: be4c7eda08 am: b20002cdeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2085466
Change-Id: Ibc412099ec92bee26dc33c63f978e0ba14da9b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) } } |