aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
diff options
context:
space:
mode:
authorGravatar hlopko <hlopko@google.com>2018-06-15 09:10:05 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-15 09:11:41 -0700
commit8820d3ae601f229b72c61d2eb601b0e8e9b0111a (patch)
tree02caa729cae33cb2414cbda033313705cf0278b9 /src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
parentb36470e6e0073a76012afbed7ba9cf9c32ef002c (diff)
Remove LIPO support
RELNOTES: Support for LIPO has been fully removed. PiperOrigin-RevId: 200724578
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 046ba3c651..9a0a54d270 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -1075,10 +1075,6 @@ public class BuildConfiguration implements BuildConfigurationApi {
private final boolean separateGenfilesDirectory;
- // Cache this value for quicker access. We don't cache it inside BuildOptions because BuildOptions
- // is mutable, so a cached value there could fall out of date when it's updated.
- private final boolean actionsEnabled;
-
/**
* The global "make variables" such as "$(TARGET_CPU)"; these get applied to all rules analyzed in
* this configuration.
@@ -1121,7 +1117,6 @@ public class BuildConfiguration implements BuildConfigurationApi {
// "bazel-out/arm-linux-fastbuild/bin" while the parent bindir is
// "bazel-out/android-arm-linux-fastbuild/bin". That's pretty awkward to check here.
// && outputRoots.equals(other.outputRoots)
- && actionsEnabled == other.actionsEnabled
&& fragments.values().containsAll(other.fragments.values())
&& buildOptions.getOptions().containsAll(other.buildOptions.getOptions()));
}
@@ -1139,17 +1134,15 @@ public class BuildConfiguration implements BuildConfigurationApi {
return false;
}
BuildConfiguration otherConfig = (BuildConfiguration) other;
- return actionsEnabled == otherConfig.actionsEnabled
- && fragments.values().equals(otherConfig.fragments.values())
+ return fragments.values().equals(otherConfig.fragments.values())
&& buildOptions.equals(otherConfig.buildOptions);
}
private int computeHashCode() {
- return Objects.hash(isActionsEnabled(), fragments, buildOptions.getOptions());
+ return Objects.hash(fragments, buildOptions.getOptions());
}
public void describe(StringBuilder sb) {
- sb.append(isActionsEnabled()).append('\n');
for (Fragment fragment : fragments.values()) {
sb.append(fragment.getClass().getName()).append('\n');
}
@@ -1243,7 +1236,6 @@ public class BuildConfiguration implements BuildConfigurationApi {
this.skylarkVisibleFragments = buildIndexOfSkylarkVisibleFragments();
this.buildOptions = buildOptions.clone();
this.buildOptionsDiff = buildOptionsDiff;
- this.actionsEnabled = buildOptions.enableActions();
this.options = buildOptions.get(Options.class);
this.separateGenfilesDirectory = options.separateGenfilesDirectory;
this.mainRepositoryName = mainRepositoryName;
@@ -1744,11 +1736,6 @@ public class BuildConfiguration implements BuildConfigurationApi {
return options.experimentalJavaCoverage;
}
- /** If false, AnalysisEnvironment doesn't register any actions created by the ConfiguredTarget. */
- public boolean isActionsEnabled() {
- return actionsEnabled;
- }
-
public RunUnder getRunUnder() {
return options.runUnder;
}
@@ -1773,7 +1760,7 @@ public class BuildConfiguration implements BuildConfigurationApi {
}
public List<Label> getActionListeners() {
- return isActionsEnabled() ? options.actionListeners : ImmutableList.<Label>of();
+ return options.actionListeners;
}
/**