Separate hidden API flag info for sdk from platform_bootclasspath
Previously, the sdk snapshot and platform_bootclasspath both used the
HiddenAPIInfo/Provider to retrieve the hidden API related information
they needed. This change separates them by adding a new
HiddenAPIInfoForSdk/Provider that is used to provide the information
needed by the sdk snapshot. This allows a follow up change to generate
different information for the sdk and for the platform depending on the
target build release of the sdk snapshot.
Bug: 240406019
Test: packages/modules/common/build/mainline_modules_sdks.sh
# Ran the previous command with and without this change to make
# sure that this change does not change the sdk snapshot
# contents.
Change-Id: I30cea6cf8dae1be467b7063430d6197e5baa684b
(cherry picked from commit 887efdd779
)
Merged-In: I30cea6cf8dae1be467b7063430d6197e5baa684b
This commit is contained in:
committed by
Cherrypicker Worker
parent
722e5ccb51
commit
311210cd65
@@ -890,6 +890,14 @@ func (b *BootclasspathFragmentModule) produceHiddenAPIOutput(ctx android.ModuleC
|
||||
EncodedBootDexFilesByModule: encodedBootDexFilesByModule,
|
||||
}
|
||||
|
||||
flagFilesByCategory := input.FlagFilesByCategory
|
||||
|
||||
// Make the information available for the sdk snapshot.
|
||||
ctx.SetProvider(HiddenAPIInfoForSdkProvider, HiddenAPIInfoForSdk{
|
||||
FlagFilesByCategory: flagFilesByCategory,
|
||||
HiddenAPIFlagOutput: flagOutput,
|
||||
})
|
||||
|
||||
return output
|
||||
}
|
||||
|
||||
@@ -1054,7 +1062,7 @@ func (b *bootclasspathFragmentSdkMemberProperties) PopulateFromVariant(ctx andro
|
||||
|
||||
// Get the hidden API information from the module.
|
||||
mctx := ctx.SdkModuleContext()
|
||||
hiddenAPIInfo := mctx.OtherModuleProvider(module, HiddenAPIInfoProvider).(HiddenAPIInfo)
|
||||
hiddenAPIInfo := mctx.OtherModuleProvider(module, HiddenAPIInfoForSdkProvider).(HiddenAPIInfoForSdk)
|
||||
b.Flag_files_by_category = hiddenAPIInfo.FlagFilesByCategory
|
||||
|
||||
// Copy all the generated file paths.
|
||||
|
Reference in New Issue
Block a user