From bc7d76cca2a9eead34b45bcdf333eecdb4152879 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 12 Dec 2023 16:39:03 -0800 Subject: Convert NewProvider/NewMutatorProvider to generic providers API Convert all of the callers to NewProvider and NewMutatorProvider to use a generic type parameter instead of an example object. Bug: 316410648 Test: builds Change-Id: Ic9cdafc87336e26730d3fd596df05de0e7267542 --- java/hiddenapi_modular.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/hiddenapi_modular.go') diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index fbc0197d6..3fc0883ce 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -600,7 +600,7 @@ func (i *HiddenAPIInfo) FlagSubset() SignatureCsvSubset { return SignatureCsvSubset{i.FilteredFlagsPath, i.SignaturePatternsPath} } -var HiddenAPIInfoProvider = blueprint.NewProvider(HiddenAPIInfo{}) +var HiddenAPIInfoProvider = blueprint.NewProvider[HiddenAPIInfo]() // HiddenAPIInfoForSdk contains information provided by the hidden API processing for use // by the sdk snapshot. @@ -617,7 +617,7 @@ type HiddenAPIInfoForSdk struct { } // Provides hidden API info for the sdk snapshot. -var HiddenAPIInfoForSdkProvider = blueprint.NewProvider(HiddenAPIInfoForSdk{}) +var HiddenAPIInfoForSdkProvider = blueprint.NewProvider[HiddenAPIInfoForSdk]() // ModuleStubDexJars contains the stub dex jars provided by a single module. // @@ -749,7 +749,7 @@ type HiddenAPIPropertyInfo struct { SplitPackages []string } -var hiddenAPIPropertyInfoProvider = blueprint.NewProvider(HiddenAPIPropertyInfo{}) +var hiddenAPIPropertyInfoProvider = blueprint.NewProvider[HiddenAPIPropertyInfo]() // newHiddenAPIPropertyInfo creates a new initialized HiddenAPIPropertyInfo struct. func newHiddenAPIPropertyInfo() HiddenAPIPropertyInfo { -- cgit v1.2.3-59-g8ed1b