summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-02-11 17:02:53 -0800
committer Cole Faust <colefaust@google.com> 2025-02-12 12:32:01 -0800
commita43fb2565c538de1768e8260168c8fd14df3a447 (patch)
treec05a7f0bfb34112bed1d75c5a7c6607b02b15420
parentdc170e72fad31a5cef8e3427773d7f9d323c03f9 (diff)
Move dists to GenerateAndroidBuildActions
So that we're not as make-focused by disting in MakeVarsProviders. Bug: 395184523 Test: Verified ninja files were unchanged (on both m nothing and m nothing dist) Change-Id: I5fd94754d644162b355722fbb1e1fd6f085345b9
-rw-r--r--aconfig/all_aconfig_declarations.go2
-rw-r--r--aconfig/build_flags/build_flags_singleton.go2
-rw-r--r--aconfig/exported_java_aconfig_library.go3
-rw-r--r--android/all_teams.go3
-rw-r--r--android/sbom.go6
-rw-r--r--android/test_suites.go3
-rw-r--r--apex/apex_singleton.go3
-rw-r--r--bloaty/bloaty.go8
-rw-r--r--cc/ccdeps.go9
-rw-r--r--java/droidstubs.go22
-rw-r--r--java/java.go7
-rw-r--r--java/jdeps.go9
-rw-r--r--java/lint.go4
-rw-r--r--java/platform_compat_config.go7
-rw-r--r--provenance/provenance_singleton.go7
15 files changed, 15 insertions, 80 deletions
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go
index b17820ea5..3d07e16dc 100644
--- a/aconfig/all_aconfig_declarations.go
+++ b/aconfig/all_aconfig_declarations.go
@@ -162,9 +162,7 @@ func (this *allAconfigDeclarationsSingleton) GenerateSingletonBuildActions(ctx a
})
ctx.Phony("all_aconfig_declarations_textproto", this.releaseMap[rcName].intermediateTextProtoPath)
}
-}
-func (this *allAconfigDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) {
for _, rcName := range this.sortedConfigNames() {
ctx.DistForGoal("droid", this.releaseMap[rcName].intermediateBinaryProtoPath)
for _, goal := range []string{"docs", "droid", "sdk"} {
diff --git a/aconfig/build_flags/build_flags_singleton.go b/aconfig/build_flags/build_flags_singleton.go
index e76db49d5..e375d9c70 100644
--- a/aconfig/build_flags/build_flags_singleton.go
+++ b/aconfig/build_flags/build_flags_singleton.go
@@ -111,9 +111,7 @@ func (this *allBuildFlagDeclarationsSingleton) GenerateBuildActions(ctx android.
this.configsBinaryProtoPath,
this.configsTextProtoPath,
)
-}
-func (this *allBuildFlagDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) {
ctx.DistForGoal("droid", this.flagsBinaryProtoPath)
for _, goal := range []string{"docs", "droid", "sdk", "release_config_metadata"} {
ctx.DistForGoalWithFilename(goal, this.flagsBinaryProtoPath, "build_flags/all_flags.pb")
diff --git a/aconfig/exported_java_aconfig_library.go b/aconfig/exported_java_aconfig_library.go
index dd068d10a..63d824a88 100644
--- a/aconfig/exported_java_aconfig_library.go
+++ b/aconfig/exported_java_aconfig_library.go
@@ -63,8 +63,5 @@ func (this *exportedJavaDeclarationsLibrarySingleton) GenerateBuildActions(ctx a
},
})
ctx.Phony("exported_java_aconfig_library", this.intermediatePath)
-}
-
-func (this *exportedJavaDeclarationsLibrarySingleton) MakeVars(ctx android.MakeVarsContext) {
ctx.DistForGoalWithFilename("sdk", this.intermediatePath, "android-flags.jar")
}
diff --git a/android/all_teams.go b/android/all_teams.go
index 01be396d5..3b20107b9 100644
--- a/android/all_teams.go
+++ b/android/all_teams.go
@@ -134,9 +134,6 @@ func (t *allTeamsSingleton) GenerateBuildActions(ctx SingletonContext) {
WriteFileRuleVerbatim(ctx, t.outputPath, string(data))
ctx.Phony("all_teams", t.outputPath)
-}
-
-func (t *allTeamsSingleton) MakeVars(ctx MakeVarsContext) {
ctx.DistForGoal("all_teams", t.outputPath)
}
diff --git a/android/sbom.go b/android/sbom.go
index f2b9c0ff1..fc61c41dd 100644
--- a/android/sbom.go
+++ b/android/sbom.go
@@ -84,12 +84,6 @@ func (this *sbomSingleton) GenerateBuildActions(ctx SingletonContext) {
Inputs: []Path{this.sbomFile},
Output: PathForPhony(ctx, "sbom"),
})
- }
-}
-
-func (this *sbomSingleton) MakeVars(ctx MakeVarsContext) {
- // When building SBOM of products
- if !ctx.Config().UnbundledBuildApps() {
ctx.DistForGoalWithFilename("droid", this.sbomFile, "sbom/sbom.spdx.json")
}
}
diff --git a/android/test_suites.go b/android/test_suites.go
index 936d2b651..18744f1da 100644
--- a/android/test_suites.go
+++ b/android/test_suites.go
@@ -58,9 +58,6 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) {
t.ravenwood = ravenwoodTestSuite(ctx, files["ravenwood-tests"])
ctx.Phony("ravenwood-tests", t.ravenwood...)
-}
-
-func (t *testSuiteFiles) MakeVars(ctx MakeVarsContext) {
ctx.DistForGoal("robolectric-tests", t.robolectric...)
ctx.DistForGoal("ravenwood-tests", t.ravenwood...)
}
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go
index 263e0a52c..a8bd984b2 100644
--- a/apex/apex_singleton.go
+++ b/apex/apex_singleton.go
@@ -175,8 +175,5 @@ func (a *apexPrebuiltInfo) GenerateBuildActions(ctx android.SingletonContext) {
}
a.out = android.PathForOutput(ctx, "prebuilt_info.json")
android.WriteFileRule(ctx, a.out, string(j))
-}
-
-func (a *apexPrebuiltInfo) MakeVars(ctx android.MakeVarsContext) {
ctx.DistForGoal("droidcore", a.out)
}
diff --git a/bloaty/bloaty.go b/bloaty/bloaty.go
index 8ecea98b4..26f2aa879 100644
--- a/bloaty/bloaty.go
+++ b/bloaty/bloaty.go
@@ -105,13 +105,11 @@ func (singleton *sizesSingleton) GenerateBuildActions(ctx android.SingletonConte
}
})
+ protoFilenamePath := android.PathForOutput(ctx, protoFilename)
ctx.Build(pctx, android.BuildParams{
Rule: bloatyMerger,
Inputs: android.SortedUniquePaths(deps),
- Output: android.PathForOutput(ctx, protoFilename),
+ Output: protoFilenamePath,
})
-}
-
-func (singleton *sizesSingleton) MakeVars(ctx android.MakeVarsContext) {
- ctx.DistForGoalWithFilename("checkbuild", android.PathForOutput(ctx, protoFilename), protoFilename)
+ ctx.DistForGoalWithFilename("checkbuild", protoFilenamePath, protoFilename)
}
diff --git a/cc/ccdeps.go b/cc/ccdeps.go
index 469fe31fa..4247778e8 100644
--- a/cc/ccdeps.go
+++ b/cc/ccdeps.go
@@ -41,8 +41,6 @@ type ccdepsGeneratorSingleton struct {
outputPath android.Path
}
-var _ android.SingletonMakeVarsProvider = (*ccdepsGeneratorSingleton)(nil)
-
const (
ccdepsJsonFileName = "module_bp_cc_deps.json"
cClang = "clang"
@@ -114,13 +112,6 @@ func (c *ccdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCon
Rule: android.Touch,
Output: ccfpath,
})
-}
-
-func (c *ccdepsGeneratorSingleton) MakeVars(ctx android.MakeVarsContext) {
- if c.outputPath == nil {
- return
- }
-
ctx.DistForGoal("general-tests", c.outputPath)
}
diff --git a/java/droidstubs.go b/java/droidstubs.go
index c8f798a9b..caad6883e 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -1429,6 +1429,16 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
d.setOutputFiles(ctx)
d.setPhonyRules(ctx)
+
+ if d.apiLintTimestamp != nil {
+ if d.apiLintReport != nil {
+ ctx.DistForGoalsWithFilename(
+ []string{fmt.Sprintf("%s-api-lint", d.Name()), "droidcore"},
+ d.apiLintReport,
+ fmt.Sprintf("apilint/%s-lint-report.txt", d.Name()),
+ )
+ }
+ }
}
func setDroidInfo(ctx android.ModuleContext, d *Droidstubs, info *StubsInfo, typ StubsType) {
@@ -1524,18 +1534,6 @@ var (
}
)
-func (d *Droidstubs) MakeVars(ctx android.MakeVarsModuleContext) {
- if d.apiLintTimestamp != nil {
- if d.apiLintReport != nil {
- ctx.DistForGoalsWithFilename(
- []string{fmt.Sprintf("%s-api-lint", d.Name()), "droidcore"},
- d.apiLintReport,
- fmt.Sprintf("apilint/%s-lint-report.txt", d.Name()),
- )
- }
- }
-}
-
func StubsDefaultsFactory() android.Module {
module := &DocDefaults{}
diff --git a/java/java.go b/java/java.go
index 91b7cf24b..383fc3ff8 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1282,13 +1282,6 @@ func (j *Library) createApiXmlFile(ctx android.ModuleContext) {
Input: j.implementationAndResourcesJar,
Output: j.apiXmlFile,
})
- }
-}
-
-var _ android.ModuleMakeVarsProvider = (*Library)(nil)
-
-func (j *Library) MakeVars(ctx android.MakeVarsModuleContext) {
- if j.apiXmlFile != nil {
ctx.DistForGoal("dist_files", j.apiXmlFile)
}
}
diff --git a/java/jdeps.go b/java/jdeps.go
index c2ce50383..927c1694d 100644
--- a/java/jdeps.go
+++ b/java/jdeps.go
@@ -37,8 +37,6 @@ type jdepsGeneratorSingleton struct {
outputPath android.Path
}
-var _ android.SingletonMakeVarsProvider = (*jdepsGeneratorSingleton)(nil)
-
const (
jdepsJsonFileName = "module_bp_java_deps.json"
)
@@ -101,13 +99,6 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
Rule: android.Touch,
Output: jfpath,
})
-}
-
-func (j *jdepsGeneratorSingleton) MakeVars(ctx android.MakeVarsContext) {
- if j.outputPath == nil {
- return
- }
-
ctx.DistForGoal("general-tests", j.outputPath)
}
diff --git a/java/lint.go b/java/lint.go
index 3838745e4..66f7f8549 100644
--- a/java/lint.go
+++ b/java/lint.go
@@ -704,16 +704,12 @@ func (l *lintSingleton) generateLintReportZips(ctx android.SingletonContext) {
zip(l.referenceBaselineZip, func(l *LintInfo) android.Path { return l.ReferenceBaseline })
ctx.Phony("lint-check", l.htmlZip, l.textZip, l.xmlZip, l.referenceBaselineZip)
-}
-func (l *lintSingleton) MakeVars(ctx android.MakeVarsContext) {
if !ctx.Config().UnbundledBuild() {
ctx.DistForGoal("lint-check", l.htmlZip, l.textZip, l.xmlZip, l.referenceBaselineZip)
}
}
-var _ android.SingletonMakeVarsProvider = (*lintSingleton)(nil)
-
func init() {
android.RegisterParallelSingletonType("lint",
func() android.Singleton { return &lintSingleton{} })
diff --git a/java/platform_compat_config.go b/java/platform_compat_config.go
index bb9894400..d4d2fb5bb 100644
--- a/java/platform_compat_config.go
+++ b/java/platform_compat_config.go
@@ -278,12 +278,7 @@ func (p *platformCompatConfigSingleton) GenerateBuildActions(ctx android.Singlet
rule.Build("merged-compat-config", "Merge compat config")
p.metadata = outputPath
-}
-
-func (p *platformCompatConfigSingleton) MakeVars(ctx android.MakeVarsContext) {
- if p.metadata != nil {
- ctx.DistForGoal("droidcore", p.metadata)
- }
+ ctx.DistForGoal("droidcore", p.metadata)
}
func platformCompatConfigSingletonFactory() android.Singleton {
diff --git a/provenance/provenance_singleton.go b/provenance/provenance_singleton.go
index c372db2b3..c1bc1c75c 100644
--- a/provenance/provenance_singleton.go
+++ b/provenance/provenance_singleton.go
@@ -99,6 +99,7 @@ func (p *provenanceInfoSingleton) GenerateBuildActions(context android.Singleton
})
context.Phony("droidcore", android.PathForPhony(context, "provenance_metadata"))
+ context.DistForGoal("droidcore", p.mergedMetaDataFile)
}
func GenerateArtifactProvenanceMetaData(ctx android.ModuleContext, artifactPath android.Path, installedFile android.InstallPath) android.Path {
@@ -116,9 +117,3 @@ func GenerateArtifactProvenanceMetaData(ctx android.ModuleContext, artifactPath
return artifactMetaDataFile
}
-
-func (p *provenanceInfoSingleton) MakeVars(ctx android.MakeVarsContext) {
- ctx.DistForGoal("droidcore", p.mergedMetaDataFile)
-}
-
-var _ android.SingletonMakeVarsProvider = (*provenanceInfoSingleton)(nil)