Earlier exit

Author: Silic0nS0ldier

src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformUtils.java

@@ -76,8 +76,7 @@ public static Platform getPlatformProto(
             ? remoteOptions.getRemoteDefaultExecProperties()
             : ImmutableSortedMap.of();
 
-    // TODO Rewrite `spawn.getExecutionPlatform() == null`, should always be set
-    if (spawn.getExecutionPlatform() == null
+    if ((spawn.getExecutionPlatform() == null || spawn.getExecutionPlatform().execProperties().isEmpty())
         && spawn.getCombinedExecProperties().isEmpty()
         && defaultExecProperties.isEmpty()
         && additionalProperties.isEmpty()) {
@@ -134,10 +133,6 @@ public static Platform getPlatformProto(
       }
     }
 
-    if (properties.size() == 0) {
-      return null;
-    }
-
     Platform.Builder platformBuilder = Platform.newBuilder();
     for (Map.Entry<String, String> entry : properties.entrySet()) {
       platformBuilder.addPropertiesBuilder().setName(entry.getKey()).setValue(entry.getValue());