diff options
| author |  John Cater <jcater@google.com> | 2018-01-30 12:33:51 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-30 12:35:42 -0800 |
| commit | b9497c1017b5efc91ef3c2bad4bf0e5de5641498 (patch) | |
| tree | abd54ff4fe3381a6e3c009ec4e104c5b8cc1ca17 /src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java | |
| parent | 8ab921afbca692dc1ad5c60dd1a247ce4fe07dcb (diff) | |
Handle the case where platformConfiguration isn't present.
Part of #4442.
Change-Id: I44f52d4200f50af0281735fbba326dce5960e950
PiperOrigin-RevId: 183874104
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java index 49b792f93f..8e2030273b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunction.java @@ -49,7 +49,9 @@ public class RegisteredExecutionPlatformsFunction implements SkyFunction { // Get the execution platforms from the configuration. PlatformConfiguration platformConfiguration = configuration.getFragment(PlatformConfiguration.class); - registeredExecutionPlatformLabels.addAll(platformConfiguration.getExtraExecutionPlatforms()); + if (platformConfiguration != null) { + registeredExecutionPlatformLabels.addAll(platformConfiguration.getExtraExecutionPlatforms()); + } // Get the registered execution platforms from the WORKSPACE. List<Label> workspaceExecutionPlatforms = getWorkspaceExecutionPlatforms(env); |