Remove includeLocations and includeRuleInputsAndOutputs subclass hooks
This was from before we had flags for these things.
@@ -171,7 +171,7 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
Build.Rule.Builder rulePb = Build.Rule.newBuilder()
.setName(rule.getLabel().toString())
.setRuleClass(rule.getRuleClass());
- if (includeLocation()) {
+ if (includeLocations) {
rulePb.setLocation(FormatUtils.getLocation(target, relativeLocations));
}
addAttributes(rulePb, rule, extraDataForPostProcess);
@@ -207,7 +207,7 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
}
rulePb.addAllAttribute(
attributes.stream().distinct().sorted(ATTRIBUTE_NAME).collect(Collectors.toList()));
- if (includeRuleInputsAndOutputs()) {
+ if (includeRuleInputsAndOutputs) {
// Add all deps from aspects as rule inputs of current target.
aspectsDependencies
.values()
@@ -242,7 +242,7 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
.setGeneratingRule(generatingRule.getLabel().toString())
.setName(label.toString());
- if (includeLocation()) {
+ if (includeLocations) {
output.setLocation(FormatUtils.getLocation(target, relativeLocations));
}
targetPb.setType(GENERATED_FILE);
@@ -254,7 +254,7 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
Build.SourceFile.Builder input = Build.SourceFile.newBuilder()
.setName(label.toString());
- if (includeLocation()) {
+ if (includeLocations) {
input.setLocation(FormatUtils.getLocation(target, relativeLocations));
}
@@ -289,7 +289,7 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
SourceFile.Builder input = SourceFile.newBuilder()
.setName(label.toString());
- if (includeLocation()) {
+ if (includeLocations) {
input.setLocation(FormatUtils.getLocation(target, relativeLocations));
}
targetPb.setType(SOURCE_FILE);
@@ -405,14 +405,6 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
return true;
}
- protected boolean includeRuleInputsAndOutputs() {
- return includeRuleInputsAndOutputs;
- }
-
- protected boolean includeLocation() {
- return includeLocations;
- }
-
/**
* Coerces the list {@param possibleValues} of values of type {@param attrType} to a single
* value of that type, in the following way:
