From 402130276c75fd967dcae894bd363edc3050d205 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 13 Dec 2023 15:19:49 -0800 Subject: [PATCH] Convert SetProvider to generic providers API Convert all of the callers of SetProvider to use the type-safe android.SetProvider API. Bug: 316410648 Test: builds Change-Id: If58f4b5355264ddab2045bc3591a4eac19cd58fc --- aconfig/aconfig_declarations.go | 4 ++-- aconfig/aconfig_value_set.go | 2 +- aconfig/aconfig_values.go | 2 +- aidl_library/aidl_library.go | 2 +- android/apex_contributions.go | 2 +- android/filegroup.go | 2 +- android/license_metadata.go | 2 +- android/licenses.go | 2 +- apex/apex.go | 6 +++--- apex/deapexer.go | 2 +- apex/prebuilt.go | 2 +- bloaty/bloaty.go | 2 +- bpf/bpf.go | 2 +- cc/cc.go | 8 ++++---- cc/fdo_profile.go | 2 +- cc/library.go | 10 +++++----- cc/library_stub.go | 4 ++-- cc/ndk_prebuilt.go | 4 ++-- cc/prebuilt.go | 6 +++--- cc/snapshot_prebuilt.go | 6 +++--- cc/vndk_prebuilt.go | 2 +- genrule/genrule.go | 2 +- java/aar.go | 10 +++++----- java/app.go | 2 +- java/base.go | 10 +++++----- java/bootclasspath_fragment.go | 8 ++++---- java/classpath_fragment.go | 2 +- java/device_host_converter.go | 2 +- java/java.go | 12 ++++++------ java/platform_bootclasspath.go | 2 +- java/robolectric.go | 2 +- java/sdk_library.go | 4 ++-- multitree/api_imports.go | 2 +- python/python.go | 2 +- python/test.go | 2 +- rust/library.go | 6 +++--- rust/protobuf.go | 2 +- rust/rust.go | 6 +++--- sh/sh_binary.go | 4 ++-- sysprop/sysprop_library.go | 2 +- testing/code_metadata.go | 2 +- testing/test_spec.go | 2 +- 42 files changed, 80 insertions(+), 80 deletions(-) diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go index 272ab038e..3cc2b9ed9 100644 --- a/aconfig/aconfig_declarations.go +++ b/aconfig/aconfig_declarations.go @@ -177,7 +177,7 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module Description: "aconfig_text", }) - ctx.SetProvider(DeclarationsProviderKey, DeclarationsProviderData{ + android.SetProvider(ctx, DeclarationsProviderKey, DeclarationsProviderData{ Package: module.properties.Package, Container: module.properties.Container, IntermediateCacheOutputPath: intermediateCacheFilePath, @@ -205,7 +205,7 @@ func CollectDependencyAconfigFiles(ctx android.ModuleContext, mergedAconfigFiles (*mergedAconfigFiles)[container] = mergeAconfigFiles(ctx, aconfigFiles) } - ctx.SetProvider(TransitiveDeclarationsInfoProvider, TransitiveDeclarationsInfo{ + android.SetProvider(ctx, TransitiveDeclarationsInfoProvider, TransitiveDeclarationsInfo{ AconfigFiles: *mergedAconfigFiles, }) } diff --git a/aconfig/aconfig_value_set.go b/aconfig/aconfig_value_set.go index 4f142e518..76e8a7793 100644 --- a/aconfig/aconfig_value_set.go +++ b/aconfig/aconfig_value_set.go @@ -84,7 +84,7 @@ func (module *ValueSetModule) GenerateAndroidBuildActions(ctx android.ModuleCont packages[depData.Package] = srcs }) - ctx.SetProvider(valueSetProviderKey, valueSetProviderData{ + android.SetProvider(ctx, valueSetProviderKey, valueSetProviderData{ AvailablePackages: packages, }) } diff --git a/aconfig/aconfig_values.go b/aconfig/aconfig_values.go index 10205bb18..239b10c4b 100644 --- a/aconfig/aconfig_values.go +++ b/aconfig/aconfig_values.go @@ -64,5 +64,5 @@ func (module *ValuesModule) GenerateAndroidBuildActions(ctx android.ModuleContex Package: module.properties.Package, Values: android.PathsForModuleSrc(ctx, module.properties.Srcs), } - ctx.SetProvider(valuesProviderKey, providerData) + android.SetProvider(ctx, valuesProviderKey, providerData) } diff --git a/aidl_library/aidl_library.go b/aidl_library/aidl_library.go index c2f97d96c..9f7cfc4b2 100644 --- a/aidl_library/aidl_library.go +++ b/aidl_library/aidl_library.go @@ -106,7 +106,7 @@ func (lib *AidlLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } - ctx.SetProvider(AidlLibraryProvider, AidlLibraryInfo{ + android.SetProvider(ctx, AidlLibraryProvider, AidlLibraryInfo{ Srcs: srcs, IncludeDirs: *includeDirsDepSetBuilder.Build(), Hdrs: *hdrsDepSetBuilder.Build(), diff --git a/android/apex_contributions.go b/android/apex_contributions.go index 89058fd5a..34941c091 100644 --- a/android/apex_contributions.go +++ b/android/apex_contributions.go @@ -119,7 +119,7 @@ func (a *allApexContributions) SetPrebuiltSelectionInfoProvider(ctx BaseModuleCo ctx.ModuleErrorf("%s is not an apex_contributions module\n", child.Name()) } }) - ctx.SetProvider(PrebuiltSelectionInfoProvider, p) + SetProvider(ctx, PrebuiltSelectionInfoProvider, p) } // A provider containing metadata about whether source or prebuilt should be used diff --git a/android/filegroup.go b/android/filegroup.go index 04bd8a8ad..0aabb6886 100644 --- a/android/filegroup.go +++ b/android/filegroup.go @@ -92,7 +92,7 @@ func (fg *fileGroup) GenerateAndroidBuildActions(ctx ModuleContext) { if fg.properties.Path != nil { fg.srcs = PathsWithModuleSrcSubDir(ctx, fg.srcs, String(fg.properties.Path)) } - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: fg.srcs.Strings()}) + SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: fg.srcs.Strings()}) } func (fg *fileGroup) Srcs() Paths { diff --git a/android/license_metadata.go b/android/license_metadata.go index b2ba5e57c..75df852f5 100644 --- a/android/license_metadata.go +++ b/android/license_metadata.go @@ -175,7 +175,7 @@ func buildLicenseMetadata(ctx ModuleContext, licenseMetadataFile WritablePath) { }, }) - ctx.SetProvider(LicenseMetadataProvider, &LicenseMetadataInfo{ + SetProvider(ctx, LicenseMetadataProvider, &LicenseMetadataInfo{ LicenseMetadataPath: licenseMetadataFile, LicenseMetadataDepSet: NewDepSet(TOPOLOGICAL, Paths{licenseMetadataFile}, allDepMetadataDepSets), }) diff --git a/android/licenses.go b/android/licenses.go index 45c914fa1..be1eedeff 100644 --- a/android/licenses.go +++ b/android/licenses.go @@ -230,7 +230,7 @@ func licensesPropertyFlattener(ctx ModuleContext) { licenseInfo := LicenseInfo{ Licenses: licenses, } - ctx.SetProvider(LicenseInfoProvider, licenseInfo) + SetProvider(ctx, LicenseInfoProvider, licenseInfo) } // Update a property string array with a distinct union of its values and a list of new values. diff --git a/apex/apex.go b/apex/apex.go index 53727644a..9dac5ce7e 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1020,7 +1020,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { // The membership information is saved for later access apexContents := android.NewApexContents(contents) - mctx.SetProvider(ApexBundleInfoProvider, ApexBundleInfo{ + android.SetProvider(mctx, ApexBundleInfoProvider, ApexBundleInfo{ Contents: apexContents, }) @@ -1058,7 +1058,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { }) if a.dynamic_common_lib_apex() { - mctx.SetProvider(DCLAInfoProvider, DCLAInfo{ + android.SetProvider(mctx, DCLAInfoProvider, DCLAInfo{ ProvidedLibs: a.properties.Native_shared_libs, }) } @@ -1204,7 +1204,7 @@ func apexTestForMutator(mctx android.BottomUpMutatorContext) { abInfo := mctx.OtherModuleProvider(testFor, ApexBundleInfoProvider).(ApexBundleInfo) contents = append(contents, abInfo.Contents) } - mctx.SetProvider(android.ApexTestForInfoProvider, android.ApexTestForInfo{ + android.SetProvider(mctx, android.ApexTestForInfoProvider, android.ApexTestForInfo{ ApexContents: contents, }) } diff --git a/apex/deapexer.go b/apex/deapexer.go index 3b7c77dc9..5aeea63d1 100644 --- a/apex/deapexer.go +++ b/apex/deapexer.go @@ -127,7 +127,7 @@ func (p *Deapexer) GenerateAndroidBuildActions(ctx android.ModuleContext) { if len(exports) > 0 { // Make the information available for other modules. di := android.NewDeapexerInfo(apexModuleName(ctx.ModuleName()), exports) - ctx.SetProvider(android.DeapexerProvider, di) + android.SetProvider(ctx, android.DeapexerProvider, di) // Create a sorted list of the files that this exports. exportedPaths = android.SortedUniquePaths(exportedPaths) diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 7d339d54e..179d90b17 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -428,7 +428,7 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) { // Create contents for the prebuilt_apex and store it away for later use. apexContents := android.NewApexContents(contents) - mctx.SetProvider(ApexBundleInfoProvider, ApexBundleInfo{ + android.SetProvider(mctx, ApexBundleInfoProvider, ApexBundleInfo{ Contents: apexContents, }) diff --git a/bloaty/bloaty.go b/bloaty/bloaty.go index 97eba7055..29a14607f 100644 --- a/bloaty/bloaty.go +++ b/bloaty/bloaty.go @@ -73,7 +73,7 @@ func MeasureSizeForPaths(ctx android.ModuleContext, paths ...android.OptionalPat mf.paths = append(mf.paths, p) } } - ctx.SetProvider(fileSizeMeasurerKey, mf) + android.SetProvider(ctx, fileSizeMeasurerKey, mf) } type sizesSingleton struct{} diff --git a/bpf/bpf.go b/bpf/bpf.go index ce57b46ad..32d62b520 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -203,7 +203,7 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) } func (bpf *bpf) AndroidMk() android.AndroidMkData { diff --git a/cc/cc.go b/cc/cc.go index 7a06128ed..fca56026a 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -2131,9 +2131,9 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { } } if c.testModule { - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: deps.GeneratedSources.Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: deps.GeneratedSources.Strings()}) aconfig.CollectDependencyAconfigFiles(ctx, &c.mergedAconfigFiles) @@ -2370,7 +2370,7 @@ func GetApiImports(c LinkableInterface, actx android.BottomUpMutatorContext) mul if len(apiImportModule) > 0 && apiImportModule[0] != nil { apiInfo := actx.OtherModuleProvider(apiImportModule[0], multitree.ApiImportsProvider).(multitree.ApiImportInfo) apiImportInfo = apiInfo - actx.SetProvider(multitree.ApiImportsProvider, apiInfo) + android.SetProvider(actx, multitree.ApiImportsProvider, apiInfo) } } } @@ -2394,7 +2394,7 @@ func GetSnapshot(c LinkableInterface, snapshotInfo **SnapshotInfo, actx android. snapshot := actx.OtherModuleProvider(snapshotModule[0], SnapshotInfoProvider).(SnapshotInfo) *snapshotInfo = &snapshot // republish the snapshot for use in later mutators on this module - actx.SetProvider(SnapshotInfoProvider, snapshot) + android.SetProvider(actx, SnapshotInfoProvider, snapshot) } } if *snapshotInfo == nil { diff --git a/cc/fdo_profile.go b/cc/fdo_profile.go index 74d511aad..0893da5e0 100644 --- a/cc/fdo_profile.go +++ b/cc/fdo_profile.go @@ -62,7 +62,7 @@ func (fp *fdoProfile) GenerateAndroidBuildActions(ctx android.ModuleContext) {} func (fp *fdoProfile) fdoProfileMutator(ctx android.BottomUpMutatorContext) { if fp.properties.Profile != nil { path := android.PathForModuleSrc(ctx, *fp.properties.Profile) - ctx.SetProvider(FdoProfileProvider, FdoProfileInfo{ + android.SetProvider(ctx, FdoProfileProvider, FdoProfileInfo{ Path: path, }) } diff --git a/cc/library.go b/cc/library.go index 4d5a2547b..d9276d630 100644 --- a/cc/library.go +++ b/cc/library.go @@ -341,7 +341,7 @@ func (f *flagExporter) addExportedGeneratedHeaders(headers ...android.Path) { } func (f *flagExporter) setProvider(ctx android.ModuleContext) { - ctx.SetProvider(FlagExporterInfoProvider, FlagExporterInfo{ + android.SetProvider(ctx, FlagExporterInfoProvider, FlagExporterInfo{ // Comes from Export_include_dirs property, and those of exported transitive deps IncludeDirs: android.FirstUniquePaths(f.dirs), // Comes from Export_system_include_dirs property, and those of exported transitive deps @@ -1071,7 +1071,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, ctx.CheckbuildFile(outputFile) if library.static() { - ctx.SetProvider(StaticLibraryInfoProvider, StaticLibraryInfo{ + android.SetProvider(ctx, StaticLibraryInfoProvider, StaticLibraryInfo{ StaticLibrary: outputFile, ReuseObjects: library.reuseObjects, Objects: library.objects, @@ -1085,7 +1085,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, } if library.header() { - ctx.SetProvider(HeaderLibraryInfoProvider, HeaderLibraryInfo{}) + android.SetProvider(ctx, HeaderLibraryInfoProvider, HeaderLibraryInfo{}) } return outputFile @@ -1239,7 +1239,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, transitiveStaticLibrariesForOrdering = s.TransitiveStaticLibrariesForOrdering } - ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{ + android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{ TableOfContents: android.OptionalPathForPath(tocFile), SharedLibrary: unstrippedOutputFile, TransitiveStaticLibrariesForOrdering: transitiveStaticLibrariesForOrdering, @@ -1264,7 +1264,7 @@ func addStubDependencyProviders(ctx ModuleContext) { FlagExporterInfo: flagInfo, }) } - ctx.SetProvider(SharedLibraryStubsProvider, SharedLibraryStubsInfo{ + android.SetProvider(ctx, SharedLibraryStubsProvider, SharedLibraryStubsInfo{ SharedStubLibraries: stubsInfo, IsLLNDK: ctx.IsLlndk(), }) diff --git a/cc/library_stub.go b/cc/library_stub.go index 18d3f210c..619e69405 100644 --- a/cc/library_stub.go +++ b/cc/library_stub.go @@ -244,7 +244,7 @@ func (d *apiLibraryDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps }, }) - ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{ + android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{ SharedLibrary: outputFile, Target: ctx.Target(), @@ -270,7 +270,7 @@ func (d *apiLibraryDecorator) shareStubs(ctx ModuleContext) { FlagExporterInfo: flagInfo, }) } - ctx.SetProvider(SharedLibraryStubsProvider, SharedLibraryStubsInfo{ + android.SetProvider(ctx, SharedLibraryStubsProvider, SharedLibraryStubsInfo{ SharedStubLibraries: stubsInfo, IsLLNDK: ctx.IsLlndk(), diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go index 842bdf6cb..f503982cd 100644 --- a/cc/ndk_prebuilt.go +++ b/cc/ndk_prebuilt.go @@ -117,13 +117,13 @@ func (ndk *ndkPrebuiltStlLinker) link(ctx ModuleContext, flags Flags, if ndk.static() { depSet := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(lib).Build() - ctx.SetProvider(StaticLibraryInfoProvider, StaticLibraryInfo{ + android.SetProvider(ctx, StaticLibraryInfoProvider, StaticLibraryInfo{ StaticLibrary: lib, TransitiveStaticLibrariesForOrdering: depSet, }) } else { - ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{ + android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{ SharedLibrary: lib, Target: ctx.Target(), }) diff --git a/cc/prebuilt.go b/cc/prebuilt.go index f68fa246e..e721c5388 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -132,7 +132,7 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, if p.static() { depSet := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(in).Build() - ctx.SetProvider(StaticLibraryInfoProvider, StaticLibraryInfo{ + android.SetProvider(ctx, StaticLibraryInfoProvider, StaticLibraryInfo{ StaticLibrary: in, TransitiveStaticLibrariesForOrdering: depSet, @@ -190,7 +190,7 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, }, }) - ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{ + android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{ SharedLibrary: outputFile, Target: ctx.Target(), @@ -213,7 +213,7 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, } if p.header() { - ctx.SetProvider(HeaderLibraryInfoProvider, HeaderLibraryInfo{}) + android.SetProvider(ctx, HeaderLibraryInfoProvider, HeaderLibraryInfo{}) // Need to return an output path so that the AndroidMk logic doesn't skip // the prebuilt header. For compatibility, in case Android.mk files use a diff --git a/cc/snapshot_prebuilt.go b/cc/snapshot_prebuilt.go index a9c4c853e..e769fe9a2 100644 --- a/cc/snapshot_prebuilt.go +++ b/cc/snapshot_prebuilt.go @@ -194,7 +194,7 @@ func (s *snapshotModule) DepsMutator(ctx android.BottomUpMutatorContext) { sharedLibs[k] = v } - ctx.SetProvider(SnapshotInfoProvider, SnapshotInfo{ + android.SetProvider(ctx, SnapshotInfoProvider, SnapshotInfo{ HeaderLibs: headers, Binaries: binaries, Objects: objects, @@ -494,7 +494,7 @@ func (p *snapshotLibraryDecorator) link(ctx ModuleContext, flags Flags, deps Pat p.tocFile = android.OptionalPathForPath(tocFile) TransformSharedObjectToToc(ctx, in, tocFile) - ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{ + android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{ SharedLibrary: in, Target: ctx.Target(), @@ -504,7 +504,7 @@ func (p *snapshotLibraryDecorator) link(ctx ModuleContext, flags Flags, deps Pat if p.static() { depSet := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(in).Build() - ctx.SetProvider(StaticLibraryInfoProvider, StaticLibraryInfo{ + android.SetProvider(ctx, StaticLibraryInfoProvider, StaticLibraryInfo{ StaticLibrary: in, TransitiveStaticLibrariesForOrdering: depSet, diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go index 5e526db92..3f3a0256d 100644 --- a/cc/vndk_prebuilt.go +++ b/cc/vndk_prebuilt.go @@ -171,7 +171,7 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext, p.androidMkSuffix = "" } - ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{ + android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{ SharedLibrary: in, Target: ctx.Target(), diff --git a/genrule/genrule.go b/genrule/genrule.go index 0512c15b7..87f6392ee 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -393,7 +393,7 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) { return srcFiles } srcFiles := addLabelsForInputs("srcs", g.properties.Srcs, g.properties.Exclude_srcs) - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcFiles.Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcFiles.Strings()}) var copyFrom android.Paths var outputFiles android.WritablePaths diff --git a/java/aar.go b/java/aar.go index bb24f2dae..f7c8367d0 100644 --- a/java/aar.go +++ b/java/aar.go @@ -825,7 +825,7 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) a.linter.resources = a.aapt.resourceFiles proguardSpecInfo := a.collectProguardSpecInfo(ctx) - ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) + android.SetProvider(ctx, ProguardSpecInfoProvider, proguardSpecInfo) exportedProguardFlagsFiles := proguardSpecInfo.ProguardFlagsFiles.ToList() a.extraProguardFlagsFiles = append(a.extraProguardFlagsFiles, exportedProguardFlagsFiles...) a.extraProguardFlagsFiles = append(a.extraProguardFlagsFiles, a.proguardOptionsFile) @@ -865,7 +865,7 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) } }) if len(prebuiltJniPackages) > 0 { - ctx.SetProvider(JniPackageProvider, JniPackageInfo{ + android.SetProvider(ctx, JniPackageProvider, JniPackageInfo{ JniPackages: prebuiltJniPackages, }) } @@ -1123,7 +1123,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { aarRTxt := extractedAARDir.Join(ctx, "R.txt") a.assetsPackage = android.PathForModuleOut(ctx, "assets.zip") a.proguardFlags = extractedAARDir.Join(ctx, "proguard.txt") - ctx.SetProvider(ProguardSpecInfoProvider, ProguardSpecInfo{ + android.SetProvider(ctx, ProguardSpecInfoProvider, ProguardSpecInfo{ ProguardFlagsFiles: android.NewDepSet[android.Path]( android.POSTORDER, android.Paths{a.proguardFlags}, @@ -1228,7 +1228,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.transitiveAaptResourcePackagesFile = transitiveAaptResourcePackagesFile a.collectTransitiveHeaderJars(ctx) - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(a.classpathFile), TransitiveLibsHeaderJars: a.transitiveLibsHeaderJars, TransitiveStaticLibsHeaderJars: a.transitiveStaticLibsHeaderJars, @@ -1258,7 +1258,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } - ctx.SetProvider(JniPackageProvider, JniPackageInfo{ + android.SetProvider(ctx, JniPackageProvider, JniPackageInfo{ JniPackages: a.jniPackages, }) } diff --git a/java/app.go b/java/app.go index ee82a3225..ef43a85c4 100755 --- a/java/app.go +++ b/java/app.go @@ -1295,7 +1295,7 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.testConfig = a.FixTestConfig(ctx, testConfig) a.extraTestConfigs = android.PathsForModuleSrc(ctx, a.testProperties.Test_options.Extra_test_configs) a.data = android.PathsForModuleSrc(ctx, a.testProperties.Data) - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } func (a *AndroidTest) FixTestConfig(ctx android.ModuleContext, testConfig android.Path) android.Path { diff --git a/java/base.go b/java/base.go index 7cd28207f..8838b0163 100644 --- a/java/base.go +++ b/java/base.go @@ -618,7 +618,7 @@ func (j *Module) provideHiddenAPIPropertyInfo(ctx android.ModuleContext) { // Populate with package rules from the properties. hiddenAPIInfo.extractPackageRulesFromProperties(&j.deviceProperties.HiddenAPIPackageProperties) - ctx.SetProvider(hiddenAPIPropertyInfoProvider, hiddenAPIInfo) + android.SetProvider(ctx, hiddenAPIPropertyInfoProvider, hiddenAPIInfo) } func (j *Module) OutputFiles(tag string) (android.Paths, error) { @@ -1143,7 +1143,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath uniqueSrcFiles = append(uniqueSrcFiles, uniqueJavaFiles...) uniqueSrcFiles = append(uniqueSrcFiles, uniqueKtFiles...) j.uniqueSrcFiles = uniqueSrcFiles - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: uniqueSrcFiles.Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: uniqueSrcFiles.Strings()}) // We don't currently run annotation processors in turbine, which means we can't use turbine // generated header jars when an annotation processor that generates API is enabled. One @@ -1178,7 +1178,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath return } - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(j.headerJarFile), TransitiveLibsHeaderJars: j.transitiveLibsHeaderJars, TransitiveStaticLibsHeaderJars: j.transitiveStaticLibsHeaderJars, @@ -1696,7 +1696,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath aconfig.CollectDependencyAconfigFiles(ctx, &j.mergedAconfigFiles) - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(j.headerJarFile), TransitiveLibsHeaderJars: j.transitiveLibsHeaderJars, TransitiveStaticLibsHeaderJars: j.transitiveStaticLibsHeaderJars, @@ -2289,7 +2289,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { case syspropPublicStubDepTag: // This is a sysprop implementation library, forward the JavaInfoProvider from // the corresponding sysprop public stub library as SyspropPublicStubInfoProvider. - ctx.SetProvider(SyspropPublicStubInfoProvider, SyspropPublicStubInfo{ + android.SetProvider(ctx, SyspropPublicStubInfoProvider, SyspropPublicStubInfo{ JavaInfo: dep, }) } diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 4eb916d59..f0b468e60 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -500,7 +500,7 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo if ctx.Module() != ctx.FinalModule() { b.HideFromMake() } - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } // getProfileProviderApex returns the name of the apex that provides a boot image profile, or an @@ -537,7 +537,7 @@ func (b *BootclasspathFragmentModule) provideApexContentInfo(ctx android.ModuleC } // Make the apex content info available for other modules. - ctx.SetProvider(BootclasspathFragmentApexContentInfoProvider, info) + android.SetProvider(ctx, BootclasspathFragmentApexContentInfoProvider, info) } // generateClasspathProtoBuildActions generates all required build actions for classpath.proto config @@ -623,7 +623,7 @@ func (b *BootclasspathFragmentModule) generateHiddenAPIBuildActions(ctx android. hiddenAPIInfo.HiddenAPIFlagOutput = output.HiddenAPIFlagOutput // Provide it for use by other modules. - ctx.SetProvider(HiddenAPIInfoProvider, hiddenAPIInfo) + android.SetProvider(ctx, HiddenAPIInfoProvider, hiddenAPIInfo) return output } @@ -744,7 +744,7 @@ func (b *BootclasspathFragmentModule) produceHiddenAPIOutput(ctx android.ModuleC } // Make the information available for the sdk snapshot. - ctx.SetProvider(HiddenAPIInfoForSdkProvider, HiddenAPIInfoForSdk{ + android.SetProvider(ctx, HiddenAPIInfoForSdkProvider, HiddenAPIInfoForSdk{ FlagFilesByCategory: flagFilesByCategory, HiddenAPIFlagOutput: flagOutput, }) diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index eecaebdb9..201780175 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -178,7 +178,7 @@ func (c *ClasspathFragmentBase) generateClasspathProtoBuildActions(ctx android.M ClasspathFragmentProtoInstallDir: c.installDirPath, ClasspathFragmentProtoOutput: c.outputFilepath, } - ctx.SetProvider(ClasspathFragmentProtoContentInfoProvider, classpathProtoInfo) + android.SetProvider(ctx, ClasspathFragmentProtoContentInfoProvider, classpathProtoInfo) } func writeClasspathsTextproto(ctx android.ModuleContext, output android.WritablePath, jars []classpathJar) { diff --git a/java/device_host_converter.go b/java/device_host_converter.go index ee8a15a03..2a41ded26 100644 --- a/java/device_host_converter.go +++ b/java/device_host_converter.go @@ -131,7 +131,7 @@ func (d *DeviceHostConverter) GenerateAndroidBuildActions(ctx android.ModuleCont d.combinedHeaderJar = d.headerJars[0] } - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: d.headerJars, ImplementationAndResourcesJars: d.implementationAndResourceJars, ImplementationJars: d.implementationJars, diff --git a/java/java.go b/java/java.go index d38af13d0..b3e281fd8 100644 --- a/java/java.go +++ b/java/java.go @@ -687,7 +687,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.stem = proptools.StringDefault(j.overridableDeviceProperties.Stem, ctx.ModuleName()) proguardSpecInfo := j.collectProguardSpecInfo(ctx) - ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) + android.SetProvider(ctx, ProguardSpecInfoProvider, proguardSpecInfo) exportedProguardFlagsFiles := proguardSpecInfo.ProguardFlagsFiles.ToList() j.extraProguardFlagsFiles = append(j.extraProguardFlagsFiles, exportedProguardFlagsFiles...) @@ -1216,12 +1216,12 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { } j.Test.generateAndroidBuildActionsWithConfig(ctx, configs) - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.generateAndroidBuildActionsWithConfig(ctx, nil) - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, configs []tradefed.Config) { @@ -1632,7 +1632,7 @@ func (ap *JavaApiContribution) GenerateAndroidBuildActions(ctx android.ModuleCon apiFile = android.PathForModuleSrc(ctx, String(apiFileString)) } - ctx.SetProvider(JavaApiImportProvider, JavaApiImportInfo{ + android.SetProvider(ctx, JavaApiImportProvider, JavaApiImportInfo{ ApiFile: apiFile, ApiSurface: proptools.String(ap.properties.Api_surface), }) @@ -2002,7 +2002,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { ctx.Phony(ctx.ModuleName(), al.stubsJar) - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(al.stubsJar), ImplementationAndResourcesJars: android.PathsIfNonNil(al.stubsJar), ImplementationJars: android.PathsIfNonNil(al.stubsJar), @@ -2320,7 +2320,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } - ctx.SetProvider(JavaInfoProvider, JavaInfo{ + android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(j.combinedClasspathFile), TransitiveLibsHeaderJars: j.transitiveLibsHeaderJars, TransitiveStaticLibsHeaderJars: j.transitiveStaticLibsHeaderJars, diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 0d52614ea..036470c61 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -389,7 +389,7 @@ func (b *platformBootclasspathModule) createAndProvideMonolithicHiddenAPIInfo(ct monolithicInfo := newMonolithicHiddenAPIInfo(ctx, temporaryInput.FlagFilesByCategory, classpathElements) // Store the information for testing. - ctx.SetProvider(MonolithicHiddenAPIInfoProvider, monolithicInfo) + android.SetProvider(ctx, MonolithicHiddenAPIInfoProvider, monolithicInfo) return monolithicInfo } diff --git a/java/robolectric.go b/java/robolectric.go index 45621fd5d..72d72fa41 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -254,7 +254,7 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) } r.installFile = ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.combinedJar, installDeps...) - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } func generateRoboTestConfig(ctx android.ModuleContext, outputFile android.WritablePath, diff --git a/java/sdk_library.go b/java/sdk_library.go index 176bda0ce..149eab683 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1451,7 +1451,7 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) // Make the set of components exported by this module available for use elsewhere. exportedComponentInfo := android.ExportedComponentsInfo{Components: android.SortedKeys(exportedComponents)} - ctx.SetProvider(android.ExportedComponentsInfoProvider, exportedComponentInfo) + android.SetProvider(ctx, android.ExportedComponentsInfoProvider, exportedComponentInfo) // Provide additional information for inclusion in an sdk's generated .info file. additionalSdkInfo := map[string]interface{}{} @@ -1471,7 +1471,7 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) scopeInfo["latest_removed_api"] = p.Path().String() } } - ctx.SetProvider(android.AdditionalSdkInfoProvider, android.AdditionalSdkInfo{additionalSdkInfo}) + android.SetProvider(ctx, android.AdditionalSdkInfoProvider, android.AdditionalSdkInfo{additionalSdkInfo}) } func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries { diff --git a/multitree/api_imports.go b/multitree/api_imports.go index e4c21f895..51b9e07a5 100644 --- a/multitree/api_imports.go +++ b/multitree/api_imports.go @@ -81,7 +81,7 @@ func (imports *ApiImports) DepsMutator(ctx android.BottomUpMutatorContext) { headerLibs := generateNameMapWithSuffix(imports.properties.Header_libs) apexSharedLibs := generateNameMapWithSuffix(imports.properties.Apex_shared_libs) - ctx.SetProvider(ApiImportsProvider, ApiImportInfo{ + android.SetProvider(ctx, ApiImportsProvider, ApiImportInfo{ SharedLibs: sharedLibs, HeaderLibs: headerLibs, ApexSharedLibs: apexSharedLibs, diff --git a/python/python.go b/python/python.go index 79b151567..d3cbd7695 100644 --- a/python/python.go +++ b/python/python.go @@ -420,7 +420,7 @@ func (p *PythonLibraryModule) AddDepsOnPythonLauncherAndStdlib(ctx android.Botto // GenerateAndroidBuildActions performs build actions common to all Python modules func (p *PythonLibraryModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { expandedSrcs := android.PathsForModuleSrcExcludes(ctx, p.properties.Srcs, p.properties.Exclude_srcs) - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: expandedSrcs.Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: expandedSrcs.Strings()}) // expand data files from "data" property. expandedData := android.PathsForModuleSrc(ctx, p.properties.Data) diff --git a/python/test.go b/python/test.go index f15a8fccf..782f39f20 100644 --- a/python/test.go +++ b/python/test.go @@ -208,7 +208,7 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext installedData := ctx.InstallTestData(installDir, p.data) p.installedDest = ctx.InstallFile(installDir, p.installSource.Base(), p.installSource, installedData...) - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } func (p *PythonTestModule) AndroidMkEntries() []android.AndroidMkEntries { diff --git a/rust/library.go b/rust/library.go index 199ffbb4c..7f004fc20 100644 --- a/rust/library.go +++ b/rust/library.go @@ -547,7 +547,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa } if library.static() || library.shared() { - ctx.SetProvider(cc.FlagExporterInfoProvider, cc.FlagExporterInfo{ + android.SetProvider(ctx, cc.FlagExporterInfoProvider, cc.FlagExporterInfo{ IncludeDirs: library.includeDirs, }) } @@ -559,7 +559,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa library.tocFile = android.OptionalPathForPath(tocFile) cc.TransformSharedObjectToToc(ctx, outputFile, tocFile) - ctx.SetProvider(cc.SharedLibraryInfoProvider, cc.SharedLibraryInfo{ + android.SetProvider(ctx, cc.SharedLibraryInfoProvider, cc.SharedLibraryInfo{ TableOfContents: android.OptionalPathForPath(tocFile), SharedLibrary: outputFile, Target: ctx.Target(), @@ -568,7 +568,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa if library.static() { depSet := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(outputFile).Build() - ctx.SetProvider(cc.StaticLibraryInfoProvider, cc.StaticLibraryInfo{ + android.SetProvider(ctx, cc.StaticLibraryInfoProvider, cc.StaticLibraryInfo{ StaticLibrary: outputFile, TransitiveStaticLibrariesForOrdering: depSet, diff --git a/rust/protobuf.go b/rust/protobuf.go index 8d231bb4d..b95d8cbab 100644 --- a/rust/protobuf.go +++ b/rust/protobuf.go @@ -186,7 +186,7 @@ func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) // stemFile must be first here as the first path in BaseSourceProvider.OutputFiles is the library entry-point. proto.BaseSourceProvider.OutputFiles = append(android.Paths{stemFile}, outputs.Paths()...) - ctx.SetProvider(cc.FlagExporterInfoProvider, cc.FlagExporterInfo{ + android.SetProvider(ctx, cc.FlagExporterInfoProvider, cc.FlagExporterInfo{ IncludeDirs: android.PathsForModuleSrc(ctx, proto.Properties.Exported_include_dirs), }) diff --git a/rust/rust.go b/rust/rust.go index c07966bdc..9a33952af 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -509,7 +509,7 @@ func (flagExporter *flagExporter) exportLinkObjects(flags ...string) { } func (flagExporter *flagExporter) setProvider(ctx ModuleContext) { - ctx.SetProvider(FlagExporterInfoProvider, FlagExporterInfo{ + android.SetProvider(ctx, FlagExporterInfoProvider, FlagExporterInfo{ LinkDirs: flagExporter.linkDirs, LinkObjects: flagExporter.linkObjects, }) @@ -950,7 +950,7 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { sourceLib := sourceMod.(*Module).compiler.(*libraryDecorator) mod.sourceProvider.setOutputFiles(sourceLib.sourceProvider.Srcs()) } - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: mod.sourceProvider.Srcs().Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: mod.sourceProvider.Srcs().Strings()}) } if mod.compiler != nil && !mod.compiler.Disabled() { @@ -1003,7 +1003,7 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { ctx.Phony("rust", ctx.RustModule().OutputFile().Path()) } if mod.testModule { - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } aconfig.CollectDependencyAconfigFiles(ctx, &mod.mergedAconfigFiles) diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 1e27375d1..97adeed86 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -270,7 +270,7 @@ func (s *ShBinary) generateAndroidBuildActions(ctx android.ModuleContext) { Output: s.outputFilePath, Input: s.sourceFilePath, }) - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: []string{s.sourceFilePath.String()}}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: []string{s.sourceFilePath.String()}}) } func (s *ShBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) { @@ -457,7 +457,7 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { installedData := ctx.InstallTestData(s.installDir, s.data) s.installedFile = ctx.InstallExecutable(s.installDir, s.outputFilePath.Base(), s.outputFilePath, installedData...) - ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{}) + android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{}) } func (s *ShTest) InstallInData() bool { diff --git a/sysprop/sysprop_library.go b/sysprop/sysprop_library.go index c89c6b09f..4a0796bd9 100644 --- a/sysprop/sysprop_library.go +++ b/sysprop/sysprop_library.go @@ -251,7 +251,7 @@ func (m *syspropLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) ctx.PropertyErrorf("srcs", "srcs contains non-sysprop file %q", syspropFile.String()) } } - ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) if ctx.Failed() { return diff --git a/testing/code_metadata.go b/testing/code_metadata.go index 53bd07be5..222a48c2c 100644 --- a/testing/code_metadata.go +++ b/testing/code_metadata.go @@ -132,7 +132,7 @@ func (module *CodeMetadataModule) GenerateAndroidBuildActions(ctx android.Module ) android.WriteFileRule(ctx, intermediatePath, string(protoData)) - ctx.SetProvider( + android.SetProvider(ctx, CodeMetadataProviderKey, CodeMetadataProviderData{IntermediatePath: intermediatePath}, ) diff --git a/testing/test_spec.go b/testing/test_spec.go index 2a05456d5..02f6c60f2 100644 --- a/testing/test_spec.go +++ b/testing/test_spec.go @@ -119,7 +119,7 @@ func (module *TestSpecModule) GenerateAndroidBuildActions(ctx android.ModuleCont } android.WriteFileRule(ctx, intermediatePath, string(protoData)) - ctx.SetProvider( + android.SetProvider(ctx, TestSpecProviderKey, TestSpecProviderData{ IntermediatePath: intermediatePath, },