From 1893176532ac61f9dc79c47c74c68f5480fbe539 Mon Sep 17 00:00:00 2001
From: Ulf Adams <ulf@engflow.com>
Date: Wed, 25 Nov 2020 22:54:35 +0100
Subject: [PATCH] Soong: add missing header-abi-dumper inputs

When soong runs the header-abi-dumper remotely, it must provide a few
dynamic libraries as toolchain inputs, or the action will fail
unconditionally on the remote execution system.

This patch allows disabling fallback for the header abi dumper
actions, i.e., this now works with remote execution:
export RBE_ABI_DUMPER_EXEC_STRATEGY=remote

Test: ran against a remote execution server; actions no longer fail remotely
Change-Id: I0c48484c03d0923dae63004fea6632704b317e95
---
 cc/builder.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cc/builder.go b/cc/builder.go
index 81c09b1a1..d69c9169e 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -219,8 +219,9 @@ var (
 		}, &remoteexec.REParams{
 			Labels:       map[string]string{"type": "abi-dump", "tool": "header-abi-dumper"},
 			ExecStrategy: "${config.REAbiDumperExecStrategy}",
+			Inputs:       []string{"$sAbiLinkerLibs"},
 			Platform: map[string]string{
-				remoteexec.PoolKey:      "${config.RECXXPool}",
+				remoteexec.PoolKey: "${config.RECXXPool}",
 			},
 		}, []string{"cFlags", "exportDirs"}, nil)