Merge "Include all_aconfig_declarations in droid dist" into main

answer35 · Feb 26, 2024 · 50bfc34 · 50bfc34
2 parents 52e5e6b + c613532
commit 50bfc34
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go
@@ -89,6 +89,8 @@ func (this *allAconfigDeclarationsSingleton) GenerateBuildActions(ctx android.Si
 
 func (this *allAconfigDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) {
 	ctx.DistForGoal("droid", this.intermediateBinaryProtoPath)
-	ctx.DistForGoalWithFilename("sdk", this.intermediateBinaryProtoPath, "flags.pb")
-	ctx.DistForGoalWithFilename("sdk", this.intermediateTextProtoPath, "flags.textproto")
+	for _, goal := range []string{"droid", "sdk"} {
+		ctx.DistForGoalWithFilename(goal, this.intermediateBinaryProtoPath, "flags.pb")
+		ctx.DistForGoalWithFilename(goal, this.intermediateTextProtoPath, "flags.textproto")
+	}
 }