aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-01-19 19:49:26 +0000
committerGravatar Vladimir Moskva <vladmos@google.com>2017-01-20 12:19:58 +0000
commitcc9f44fa89345963174caa2cf8177a8d49993066 (patch)
tree0378d740405ee9745cbb1624766c5ebe8e04219e
parent0fbd21ff653fde2b502ad087450c811c42035cb5 (diff)
Change SpawnAction members back to private
As pointed out in the new review comments on commit df726eae7b6ef11df3b962d720df36f63d5cd3a3, the SpawnAction members did not need to be changed from private to protected, they just needed to be accessed via accessor methods in the derived LTOBackendAction class. -- PiperOrigin-RevId: 144989490 MOS_MIGRATED_REVID=144989490
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/LTOBackendAction.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index c03789ea1d..607028f5cb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -85,13 +85,13 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie
private static final String GUID = "ebd6fce3-093e-45ee-adb6-bf513b602f0d";
- protected final CommandLine argv;
+ private final CommandLine argv;
private final boolean executeUnconditionally;
private final String progressMessage;
private final String mnemonic;
// entries are (directory for remote execution, Artifact)
- protected final ImmutableMap<PathFragment, Artifact> inputManifests;
+ private final ImmutableMap<PathFragment, Artifact> inputManifests;
private final ResourceSet resourceSet;
private final ImmutableMap<String, String> environment;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LTOBackendAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LTOBackendAction.java
index abc90a3585..e7f9411d0e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LTOBackendAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LTOBackendAction.java
@@ -199,10 +199,10 @@ public final class LTOBackendAction extends SpawnAction {
protected String computeKey() {
Fingerprint f = new Fingerprint();
f.addString(GUID);
- f.addStrings(argv.arguments());
+ f.addStrings(getArguments());
f.addString(getMnemonic());
- f.addInt(inputManifests.size());
- for (Map.Entry<PathFragment, Artifact> input : inputManifests.entrySet()) {
+ f.addInt(getInputManifests().size());
+ for (Map.Entry<PathFragment, Artifact> input : getInputManifests().entrySet()) {
f.addString(input.getKey().getPathString() + "/");
f.addPath(input.getValue().getExecPath());
}