diff options
| author | 2021-03-24 14:09:28 -0700 | |
|---|---|---|
| committer | 2021-03-25 11:06:45 -0700 | |
| commit | a4eafddc41d81d066650618eae24792cb66064c9 (patch) | |
| tree | 1ad820dac352ec0b35537990c8afc3be3662254c /java/builder.go | |
| parent | fd708b5651be777b444406aaae02dff3c7a4a143 (diff) | |
Support multiple rsp files in REParams
rewrapper supports a comma separate list of rsp files, replace
REParams.RSPFile with REParmas.RSPFiles.
Test: remoteexec_test.go
Change-Id: I7850c071c23d368d6fad4480dd527d146c13c6d3
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/builder.go b/java/builder.go index fc740a831..cde87310f 100644 --- a/java/builder.go +++ b/java/builder.go @@ -150,7 +150,7 @@ var ( &remoteexec.REParams{Labels: map[string]string{"type": "tool", "name": "turbine"}, ExecStrategy: "${config.RETurbineExecStrategy}", Inputs: []string{"${config.TurbineJar}", "${out}.rsp", "$implicits"}, - RSPFile: "${out}.rsp", + RSPFiles: []string{"${out}.rsp"}, OutputFiles: []string{"$out.tmp"}, OutputDirectories: []string{"$outDir"}, ToolchainInputs: []string{"${config.JavaCmd}"}, @@ -167,7 +167,7 @@ var ( &remoteexec.REParams{ ExecStrategy: "${config.REJarExecStrategy}", Inputs: []string{"${config.SoongZipCmd}", "${out}.rsp"}, - RSPFile: "${out}.rsp", + RSPFiles: []string{"${out}.rsp"}, OutputFiles: []string{"$out"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, }, []string{"jarArgs"}, nil) @@ -182,7 +182,7 @@ var ( &remoteexec.REParams{ ExecStrategy: "${config.REZipExecStrategy}", Inputs: []string{"${config.SoongZipCmd}", "${out}.rsp", "$implicits"}, - RSPFile: "${out}.rsp", + RSPFiles: []string{"${out}.rsp"}, OutputFiles: []string{"$out"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, }, []string{"jarArgs"}, []string{"implicits"}) |