From 8e7786a0fd0e2fa1dfd9d11556ce06ae2bf9abfc Mon Sep 17 00:00:00 2001
From: Jingwen Chen <jingwen@google.com>
Date: Mon, 6 Dec 2021 13:30:18 +0000
Subject: [PATCH] Forward descriptions to primary build invocations.

Test: m nothing bp2build json-module-graph queryview soong_docs
Change-Id: Ic64238dc10a90c923cf5559d1bbbc51fd0922e31
---
 bootstrap/bootstrap.go | 3 ++-
 bootstrap/config.go    | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index 13c6a0b..e90940e 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -691,7 +691,8 @@ func (s *singleton) GenerateBuildActions(ctx blueprint.SingletonContext) {
 			// soong_ui explicitly requests what it wants to be build. This is
 			// because the same Ninja file contains instructions to run
 			// soong_build, run bp2build and to generate the JSON module graph.
-			Optional: true,
+			Optional:    true,
+			Description: i.Description,
 		})
 	}
 
diff --git a/bootstrap/config.go b/bootstrap/config.go
index 6d596bc..4978410 100644
--- a/bootstrap/config.go
+++ b/bootstrap/config.go
@@ -105,7 +105,8 @@ const (
 )
 
 type PrimaryBuilderInvocation struct {
-	Inputs  []string
-	Outputs []string
-	Args    []string
+	Inputs      []string
+	Outputs     []string
+	Args        []string
+	Description string
 }