Merge "Include all_aconfig_declarations in droid dist" into main am: 50bfc34894
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973436
Change-Id: I5706e69be381c4ff41cc49712da01ce28f98323b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go
index 3d9663c..72fe495 100644
--- a/aconfig/all_aconfig_declarations.go
+++ b/aconfig/all_aconfig_declarations.go
@@ -89,6 +89,8 @@
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")
+ }
}