diff options
| author | 2021-05-21 22:46:59 +0100 | |
|---|---|---|
| committer | 2021-05-24 13:32:56 +0100 | |
| commit | 18cf19745e2fffb184a7b42f50609ea98d4adb1d (patch) | |
| tree | 747b4ea68bbe867faaa0172f571e2fb1b41e4931 /java/bootclasspath_fragment.go | |
| parent | 62370923911827d0a9cf6103e47652f40ca2cd25 (diff) | |
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
Change-Id: I5459c56de561c053ed671dc9d5cb3ee4820c0ee8
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 1807ce70f..0d61d82c9 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -507,10 +507,6 @@ func (b *BootclasspathFragmentModule) generateHiddenAPIBuildActions(ctx android. // 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 @@ func (b *BootclasspathFragmentModule) generateHiddenAPIBuildActions(ctx android. // 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 { |