diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
3 files changed, 12 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/DottedVersion.java b/src/main/java/com/google/devtools/build/lib/rules/apple/DottedVersion.java index 4082f1cf41..189462e947 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/DottedVersion.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/DottedVersion.java @@ -160,12 +160,6 @@ public final class DottedVersion implements Comparable<DottedVersion>, SkylarkVa } @Override - @SkylarkCallable( - name = "compare_to", - doc = - "Compares based on most signifigant (first) not-matching version component. " - + "So, for example, 1.2.3 < 1.2.4" - ) public int compareTo(DottedVersion other) { int maxComponents = Math.max(components.size(), other.components.size()); for (int componentIndex = 0; componentIndex < maxComponents; componentIndex++) { @@ -179,6 +173,16 @@ public final class DottedVersion implements Comparable<DottedVersion>, SkylarkVa return 0; } + @SkylarkCallable( + name = "compare_to", + doc = + "Compares based on most significant (first) not-matching version component. " + + "So, for example, 1.2.3 < 1.2.4" + ) + public int compareTo_skylark(DottedVersion other) { + return compareTo(other); + } + /** * Returns the string representation of this dotted version, padded to a minimum number of * components if the string representation does not already contain that many components. diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java index e8781c935d..00345db1d3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagProvider.java @@ -94,7 +94,7 @@ public class ConfigFeatureFlagProvider extends NativeInfo { doc = "The current value of the flag in the flag's current configuration.", structField = true ) - public String getValue() { + public String getFlagValue() { return value; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java index 1d475f97ea..ee57673d77 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigSetting.java @@ -400,7 +400,7 @@ public class ConfigSetting implements RuleConfiguredTargetFactory { matches = false; continue; } - if (!provider.getValue().equals(specifiedValue)) { + if (!provider.getFlagValue().equals(specifiedValue)) { matches = false; } } |