Remove bootclasspathApiInfo
Previously, the bootclasspathApiInfo was only used for tests and follow
up changes will need to provide the stub dex jars. This change moves
the stubJarsByKind into HiddenAPIInfo and removes bootclasspathApiInfo
and the corresponding provider.
Bug: 179354495
Test: m nothing
Merged-In: I5459c56de561c053ed671dc9d5cb3ee4820c0ee8
Change-Id: I5459c56de561c053ed671dc9d5cb3ee4820c0ee8
(cherry picked from commit 18cf19745e2fffb184a7b42f50609ea98d4adb1d)
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index 1807ce7..0d61d82 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -507,10 +507,6 @@
// Create hidden API input structure.
input := b.createHiddenAPIFlagInput(ctx, contents)
- // Store the information for use by other modules.
- bootclasspathApiInfo := bootclasspathApiInfo{stubJarsByKind: input.StubDexJarsByKind}
- ctx.SetProvider(bootclasspathApiInfoProvider, bootclasspathApiInfo)
-
var output *HiddenAPIFlagOutput
// Hidden API processing is conditional as a temporary workaround as not all
@@ -534,6 +530,9 @@
// generation. That is because the monolithic hidden API processing uses those flag files to
// perform its own flag generation.
FlagFilesByCategory: input.FlagFilesByCategory,
+
+ // Make these available for tests.
+ StubDexJarsByKind: input.StubDexJarsByKind,
}
if output != nil {