diff options
| author |  John Cater <jcater@google.com> | 2018-07-27 14:10:09 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-27 14:13:39 -0700 |
| commit | c809afca846de06a2c248d8df5fa4b43b9bcfcdd (patch) | |
| tree | ec104f2fc3b16412a64882277a286af85198a003 /src/main/java/com | |
| parent | be88b8539b30d1c36c68b0f6acfe1e9ae010db3b (diff) | |
Make sure the --host_platform_remote_properties_override flags is
honored when creating the host platform.
Fixes #5695.
Change-Id: Iaa99c8189421893440e5e5140450c70de69d7b86
Closes #5696.
Change-Id: Iaa99c8189421893440e5e5140450c70de69d7b86
PiperOrigin-RevId: 206371468
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/platform/Platform.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/platform/Platform.java b/src/main/java/com/google/devtools/build/lib/rules/platform/Platform.java index 2cab122c8b..39c491fef8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/platform/Platform.java +++ b/src/main/java/com/google/devtools/build/lib/rules/platform/Platform.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.rules.platform; +import com.google.common.base.Strings; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; @@ -69,7 +70,7 @@ public class Platform implements RuleConfiguredTargetFactory { String remoteExecutionProperties = ruleContext.attributes().get(PlatformRule.REMOTE_EXECUTION_PROPS_ATTR, Type.STRING); - if (platformBuilder.getRemoteExecutionProperties() == null && isHostPlatform) { + if (Strings.isNullOrEmpty(platformBuilder.getRemoteExecutionProperties()) && isHostPlatform) { // Use the default override. PlatformOptions platformOptions = ruleContext.getConfiguration().getOptions().get(PlatformOptions.class); |