diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java | 9 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/BazelPrerequisiteValidator.java | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java index beb12bfa35..76fc7d314b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java @@ -157,9 +157,14 @@ public class ConfiguredRuleClassProvider implements RuleClassProvider { if (prerequisiteTarget instanceof Rule) { Rule prerequisiteRule = (Rule) prerequisiteTarget; String thisDeprecation = - NonconfigurableAttributeMapper.of(rule).get("deprecation", Type.STRING); + NonconfigurableAttributeMapper.of(rule).has("deprecation", Type.STRING) + ? NonconfigurableAttributeMapper.of(rule).get("deprecation", Type.STRING) + : null; String thatDeprecation = - NonconfigurableAttributeMapper.of(prerequisiteRule).get("deprecation", Type.STRING); + NonconfigurableAttributeMapper.of(prerequisiteRule).has("deprecation", Type.STRING) + ? NonconfigurableAttributeMapper.of(prerequisiteRule) + .get("deprecation", Type.STRING) + : null; if (shouldEmitDeprecationWarningFor( thisDeprecation, thisPackage, thatDeprecation, thatPackage, forAspect)) { errors.ruleWarning("target '" + rule.getLabel() + "' depends on deprecated target '" diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelPrerequisiteValidator.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelPrerequisiteValidator.java index 2a62df3ff7..afdcb18003 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelPrerequisiteValidator.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelPrerequisiteValidator.java @@ -127,6 +127,7 @@ public class BazelPrerequisiteValidator private static boolean isTestOnlyRule(Target target) { return (target instanceof Rule) + && (NonconfigurableAttributeMapper.of((Rule) target)).has("testonly", Type.BOOLEAN) && (NonconfigurableAttributeMapper.of((Rule) target)).get("testonly", Type.BOOLEAN); } } |