commit 64f2d844f27511ffdc062fe77384577d33d62880
author Cole Faust <colefaust@google.com> Thu Oct 17 13:28:34 2024 -0700
committer Cole Faust <colefaust@google.com> Thu Oct 17 13:28:34 2024 -0700
tree bb9252fc4d53b8e1c00e462eb7e16d8b931af84c
parent 991d11df34cc11d0dd71c8e4334fc3fc9e28e054

Make uses_libs and optional_uses_libs configurable

Requested for the mk2bp conversion.

Fixes: 373772769
Test: m nothing --no-skip-soong-tests
Change-Id: I9a36e73f20c73e25b555fb3f0a074b30a548ae50

java/base.go

diff --git a/java/base.go b/java/base.go
index a9399cb..f6764b6 100644
--- a/java/base.go
+++ b/java/base.go
@@ -862,7 +862,7 @@
 					// explicitly listed in the optional_uses_libs property.
 					tag := usesLibReqTag
 					if android.InList(*lib, dexpreopt.OptionalCompatUsesLibs) ||
-						android.InList(*lib, j.usesLibrary.usesLibraryProperties.Optional_uses_libs) {
+						android.InList(*lib, j.usesLibrary.usesLibraryProperties.Optional_uses_libs.GetOrDefault(ctx, nil)) {
 						tag = usesLibOptTag
 					}
 					ctx.AddVariationDependencies(nil, tag, *lib)