BuildOptions cleanup:

1) Remove obsolete originalOptions field. This was originally added to
   support "parent" transitions, which supported config1 -> config2 -> config1
   transitions by having config2 store config1's options.

   The purpose of this feature was to support LIPO (which has a DATA -> TARGET
   transition). But https://github.com/bazelbuild/bazel/commit/ff29c0b39cf936a2699b05edd54f483f1a037d93
   makes this unnecessary.

2) Support the "disable actions" feature of the LIPO context collector configuration.
   Putting this in BuildOptions make this dynamic config-compatible.

This change intentionally doesn't add disableOptions to BuildOptions.equals() or
BuildOptions.hashCode(). It'd be great to do that. But that has semantic consequences.
And we've run into really tricky bugs in the past with dynamic configurations and
BuildOptions.equals / BuildConfiguration.equals. So it's best to experiment with
that in its own change.

PiperOrigin-RevId: 154999718

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java
index 3f18f8502b..60445831ec 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationFunction.java
@@ -70,7 +70,7 @@ public class BuildConfigurationFunction implements SkyFunction {
     }
 
     BuildConfiguration config = new BuildConfiguration(directories, fragmentsMap,
-        key.getBuildOptions(), !key.actionsEnabled());
+        key.getBuildOptions());
     // Unlike static configurations, dynamic configurations don't need to embed transition logic
     // within the configuration itself. However we still use this interface to provide a mapping
     // between Transition types (e.g. HOST) and the dynamic transitions that apply those