From 92b0eb18e199f44ddc26b32ae993d9909f1fd7fa Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 6 Feb 2025 11:49:52 -0800 Subject: Pass libraryToApex and apexNameToFragment mappings into CreateClasspathElements Remove a usage of ApexInfo.InApexVariants by collecting the libraryToApex and apexToFragment mappings while collecting the fragments and passing them into CreateClasspathElements. Bug: 372543712 Test: CreateClasspathElementTest Change-Id: I03adc821b04bc01828f075f25bbb8124505859a7 --- java/bootclasspath_fragment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/bootclasspath_fragment.go') diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index f3bff12f2..fd4b0a305 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -513,7 +513,7 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo } }) - fragments := gatherApexModulePairDepsWithTag(ctx, fragment) + fragments, _ := gatherFragments(ctx) // Perform hidden API processing. hiddenAPIOutput := b.generateHiddenAPIBuildActions(ctx, contents, fragments) -- cgit v1.2.3-59-g8ed1b