Skip to content

Commit 88395ce

Browse files
Add missing check for remote exec properties
1 parent fca4828 commit 88395ce

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ public static Platform getPlatformProto(
7676
? remoteOptions.getRemoteDefaultExecProperties()
7777
: ImmutableSortedMap.of();
7878

79-
if ((spawn.getExecutionPlatform() == null || spawn.getExecutionPlatform().execProperties().isEmpty())
79+
if ((spawn.getExecutionPlatform() == null
80+
|| (
81+
spawn.getExecutionPlatform().execProperties().isEmpty()
82+
&& spawn.getExecutionPlatform().remoteExecutionProperties().isEmpty()
83+
))
8084
&& spawn.getCombinedExecProperties().isEmpty()
8185
&& defaultExecProperties.isEmpty()
8286
&& additionalProperties.isEmpty()) {

0 commit comments

Comments
 (0)