From ef75beb068a79a9ef6ed4130c441ed7ac032f8bc Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 2 Jan 2024 16:58:49 -0800 Subject: [PATCH] Add implicit inputs to primary builder actions This is needed so primary builder actions can directly depend on their glob result files. Bug: 318434287 Test: rm -rf out && m nothing && m nothing Change-Id: I5c67ee53c9f18f81c79c0fe13b3338eacaccdbc0 --- bootstrap/bootstrap.go | 1 + bootstrap/config.go | 1 + 2 files changed, 2 insertions(+) diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go index 7465aff..8ed06d0 100644 --- a/bootstrap/bootstrap.go +++ b/bootstrap/bootstrap.go @@ -760,6 +760,7 @@ func (s *singleton) GenerateBuildActions(ctx blueprint.SingletonContext) { Rule: generateBuildNinja, Outputs: i.Outputs, Inputs: i.Inputs, + Implicits: i.Implicits, OrderOnly: i.OrderOnlyInputs, Args: map[string]string{ "builder": primaryBuilderFile, diff --git a/bootstrap/config.go b/bootstrap/config.go index 1d256ba..929eac5 100644 --- a/bootstrap/config.go +++ b/bootstrap/config.go @@ -106,6 +106,7 @@ const ( type PrimaryBuilderInvocation struct { Inputs []string + Implicits []string OrderOnlyInputs []string Outputs []string Args []string