diff options
author | cpeyser <cpeyser@google.com> | 2017-09-01 00:15:29 +0200 |
---|---|---|
committer | Vladimir Moskva <vladmos@google.com> | 2017-09-01 12:28:36 +0200 |
commit | 8613c90911990431c7356a48b20504cba479ac4b (patch) | |
tree | 253cda56fba4621bebe571c852434f89716232b5 /src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java | |
parent | a117235b926eb477299436328a34ad4b1ea0eec0 (diff) |
Automated rollback of commit 2b983bdf508e010a3d4ee9dbaf446b7666749799.
*** Reason for rollback ***
Breaks rules_go CI
*** Original change description ***
Rollforward of c++ toolchain-relevant BUILD file and Bazel mocking changes. That is, a c++ toolchain is added, but a Bazel dependency on that toolchain is not.
PiperOrigin-RevId: 167198874
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java index 45c967e551..d93c5a6dea 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformSemantics.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleClass; import java.util.List; -import javax.annotation.Nullable; /** Helper class to manage rules' use of platforms. */ public class PlatformSemantics { @@ -41,22 +40,19 @@ public class PlatformSemantics { @Override public List<Label> resolve( Rule rule, AttributeMap attributes, BuildConfiguration configuration) { - // rule may be null for tests - if (rule == null || rule.getRuleClassObject().getRequiredToolchains().isEmpty()) { - return ImmutableList.of(); + if (rule.getRuleClassObject().getRequiredToolchains().isEmpty()) { + return null; } return configuration.getFragment(PlatformConfiguration.class).getTargetPlatforms(); } }; /** Implementation for the :execution_platform attribute. */ - @Nullable public static final Attribute.LateBoundLabel<BuildConfiguration> EXECUTION_PLATFORM = new Attribute.LateBoundLabel<BuildConfiguration>(PlatformConfiguration.class) { @Override public Label resolve(Rule rule, AttributeMap attributes, BuildConfiguration configuration) { - // rule may be null for tests - if (rule == null || rule.getRuleClassObject().getRequiredToolchains().isEmpty()) { + if (rule.getRuleClassObject().getRequiredToolchains().isEmpty()) { return null; } return configuration.getFragment(PlatformConfiguration.class).getExecutionPlatform(); |