commit 77ef8d61356961e877f5043cc655c8d3501adaec
author Googler <noreply@google.com> Tue Jul 23 11:55:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 23 11:56:45 2019 -0700
tree 5ef65aa446b24ecf567f55f27fccb11e9de43ef0
parent dd8a75e674c5b91f8783764fa44fe8f7b7e2bc2d

Consolidating the uses of remoteExecutionProperties in preparation for adding
extra logic.

As a side effect, Docker Sandbox now recognizes remote_default_platform_properties

RELNOTES: Docker Sandbox now respects remote_default_platform_properties
PiperOrigin-RevId: 259581729

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
index 1f3908a..06f4a04 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
@@ -35,6 +35,7 @@
 import com.google.devtools.build.lib.actions.SpawnResult.Status;
 import com.google.devtools.build.lib.actions.Spawns;
 import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
+import com.google.devtools.build.lib.analysis.platform.PlatformUtils;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.Reporter;
@@ -129,9 +130,7 @@
     Digest merkleTreeRoot = merkleTree.getRootDigest();
 
     // Get the remote platform properties.
-    Platform platform =
-        RemoteSpawnRunner.parsePlatform(
-            spawn.getExecutionPlatform(), options.remoteDefaultPlatformProperties);
+    Platform platform = PlatformUtils.getPlatformProto(spawn.getExecutionPlatform(), options);
 
     Command command =
         RemoteSpawnRunner.buildCommand(