diff options
author | 2024-12-18 22:32:59 +0000 | |
---|---|---|
committer | 2024-12-18 22:32:59 +0000 | |
commit | df6187791317457f20b2507c38bac18d2d241168 (patch) | |
tree | f2b41a014f263ab7ad77490aca56db67d3c0539b | |
parent | ffe8632a5f58f39296f8c6c904880ba7fff6228e (diff) |
Remove source_file_provider.go after it's last usage was removed.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Iff10448dc4dda49e1f02258a4c113db75778a95d
-rw-r--r-- | android/filegroup.go | 1 | ||||
-rw-r--r-- | bpf/bpf.go | 2 | ||||
-rw-r--r-- | bpf/libbpf/libbpf_prog.go | 2 | ||||
-rw-r--r-- | cc/cc.go | 2 | ||||
-rw-r--r-- | genrule/genrule.go | 1 | ||||
-rw-r--r-- | genrule/genrule_test.go | 8 | ||||
-rw-r--r-- | java/base.go | 1 | ||||
-rw-r--r-- | java/sdk_library.go | 1 | ||||
-rw-r--r-- | python/python.go | 1 | ||||
-rw-r--r-- | rust/rust.go | 1 | ||||
-rw-r--r-- | sh/sh_binary.go | 2 | ||||
-rw-r--r-- | sysprop/sysprop_library.go | 1 |
12 files changed, 0 insertions, 23 deletions
diff --git a/android/filegroup.go b/android/filegroup.go index 67e5add1f..4daff8f68 100644 --- a/android/filegroup.go +++ b/android/filegroup.go @@ -104,7 +104,6 @@ func (fg *fileGroup) GenerateAndroidBuildActions(ctx ModuleContext) { if fg.properties.Path != nil { srcs = PathsWithModuleSrcSubDir(ctx, srcs, String(fg.properties.Path)) } - SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) var aconfigDeclarations []string var intermediateCacheOutputPaths Paths diff --git a/bpf/bpf.go b/bpf/bpf.go index 3b7073e1b..3f3438247 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -230,8 +230,6 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) { ctx.PackageFile(installDir, obj.Base(), obj) } - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) - ctx.SetOutputFiles(bpf.objs, "") } diff --git a/bpf/libbpf/libbpf_prog.go b/bpf/libbpf/libbpf_prog.go index 3b26d4654..44013e5e3 100644 --- a/bpf/libbpf/libbpf_prog.go +++ b/bpf/libbpf/libbpf_prog.go @@ -239,8 +239,6 @@ func (libbpf *libbpfProg) GenerateAndroidBuildActions(ctx android.ModuleContext) ctx.PackageFile(installDir, obj.Base(), obj) } - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) - ctx.SetOutputFiles(libbpf.objs, "") } @@ -2120,8 +2120,6 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { }) } - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: deps.GeneratedSources.Strings()}) - if Bool(c.Properties.Cmake_snapshot_supported) { android.SetProvider(ctx, cmakeSnapshotSourcesProvider, android.GlobFiles(ctx, ctx.ModuleDir()+"/**/*", nil)) } diff --git a/genrule/genrule.go b/genrule/genrule.go index ac62b8d06..6137c707a 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -455,7 +455,6 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) { srcFiles = append(srcFiles, addLabelsForInputs("device_first_srcs", g.properties.Device_first_srcs.GetOrDefault(ctx, nil), nil)...) srcFiles = append(srcFiles, addLabelsForInputs("device_common_srcs", g.properties.Device_common_srcs.GetOrDefault(ctx, nil), nil)...) srcFiles = append(srcFiles, addLabelsForInputs("common_os_srcs", g.properties.Common_os_srcs.GetOrDefault(ctx, nil), nil)...) - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcFiles.Strings()}) var copyFrom android.Paths var outputFiles android.WritablePaths diff --git a/genrule/genrule_test.go b/genrule/genrule_test.go index f190750d1..688db0761 100644 --- a/genrule/genrule_test.go +++ b/genrule/genrule_test.go @@ -24,7 +24,6 @@ import ( "android/soong/android" - "github.com/google/blueprint" "github.com/google/blueprint/proptools" ) @@ -694,13 +693,6 @@ func TestGenruleDefaults(t *testing.T) { expectedCmd := "cp in1 __SBOX_SANDBOX_DIR__/out/out" android.AssertStringEquals(t, "cmd", expectedCmd, gen.rawCommands[0]) - - srcsFileProvider, ok := android.OtherModuleProvider(result.TestContext, gen, blueprint.SrcsFileProviderKey) - if !ok { - t.Fatal("Expected genrule to have a SrcsFileProviderData, but did not") - } - expectedSrcs := []string{"in1"} - android.AssertDeepEquals(t, "srcs", expectedSrcs, srcsFileProvider.SrcPaths) } func TestGenruleAllowMissingDependencies(t *testing.T) { diff --git a/java/base.go b/java/base.go index 18a875b9c..5c1ef8585 100644 --- a/java/base.go +++ b/java/base.go @@ -1241,7 +1241,6 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath uniqueSrcFiles = append(uniqueSrcFiles, uniqueJavaFiles...) uniqueSrcFiles = append(uniqueSrcFiles, uniqueKtFiles...) j.uniqueSrcFiles = uniqueSrcFiles - 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 diff --git a/java/sdk_library.go b/java/sdk_library.go index 991f84767..a0affe0a5 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1479,7 +1479,6 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) ctx.CheckbuildFile(installFilesInfo.CheckbuildTarget) } } - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: module.implLibraryModule.uniqueSrcFiles.Strings()}) } // Make the set of components exported by this module available for use elsewhere. diff --git a/python/python.go b/python/python.go index d3e5743b5..be9411bbf 100644 --- a/python/python.go +++ b/python/python.go @@ -447,7 +447,6 @@ 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) - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: expandedSrcs.Strings()}) // Keep before any early returns. android.SetProvider(ctx, android.TestOnlyProviderKey, android.TestModuleInformation{ TestOnly: Bool(p.sourceProperties.Test_only), diff --git a/rust/rust.go b/rust/rust.go index 0c48154bb..246670ff3 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -946,7 +946,6 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { mod.sourceProvider.setOutputFiles(sourceLib.sourceProvider.Srcs()) } ctx.CheckbuildFile(mod.sourceProvider.Srcs()...) - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: mod.sourceProvider.Srcs().Strings()}) } if mod.compiler != nil && !mod.compiler.Disabled() { diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 7f5a4261f..60c53177d 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -314,8 +314,6 @@ func (s *ShBinary) generateAndroidBuildActions(ctx android.ModuleContext) { s.properties.SubName = s.GetSubname(ctx) - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: []string{s.sourceFilePath.String()}}) - ctx.SetOutputFiles(android.Paths{s.outputFilePath}, "") } diff --git a/sysprop/sysprop_library.go b/sysprop/sysprop_library.go index 77d5853ac..25fbc41d3 100644 --- a/sysprop/sysprop_library.go +++ b/sysprop/sysprop_library.go @@ -346,7 +346,6 @@ func (m *syspropLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) ctx.PropertyErrorf("srcs", "srcs contains non-sysprop file %q", syspropFile.String()) } } - android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: srcs.Strings()}) if ctx.Failed() { return |