diff options
author | gregce <gregce@google.com> | 2017-07-26 00:19:10 +0200 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2017-07-26 10:35:05 +0200 |
commit | 9a3028ce684f1d71d887095b23dd922d55ecfbf9 (patch) | |
tree | f9c9ba262033613d3c608ab959606a8cc125eaec /src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java | |
parent | 1dc4c710ec577ca34742aeeb09a634dec21bef68 (diff) |
Remove --experimental_dynamic_configs=notrim_partial.
Part of the static configuration removal cleanup.
PiperOrigin-RevId: 163130922
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java index e1f012f25f..95f9ea9619 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java @@ -132,25 +132,6 @@ public final class BuildOptions implements Cloneable, Serializable { } /** - * Returns a cloned instance that disables dynamic configurations if both - * {@link BuildConfiguration.Options.DynamicConfigsMode} is {@code NOTRIM_PARTIAL} and - * {@link #useStaticConfigurationsOverride()} is true. Otherwise it returns the input - * instance unchanged. - */ - public static BuildOptions applyStaticConfigOverride(BuildOptions buildOptions) { - if (buildOptions.useStaticConfigurationsOverride() - && buildOptions.get(BuildConfiguration.Options.class).useDynamicConfigurations - == BuildConfiguration.Options.DynamicConfigsMode.NOTRIM_PARTIAL) { - // It's not, generally speaking, safe to mutate BuildOptions instances when the original - // reference might persist. - buildOptions = buildOptions.clone(); - buildOptions.get(BuildConfiguration.Options.class).useDynamicConfigurations = - BuildConfiguration.Options.DynamicConfigsMode.OFF; - } - return buildOptions; - } - - /** * Returns the actual instance of a FragmentOptions class. */ public <T extends FragmentOptions> T get(Class<T> optionsClass) { @@ -198,19 +179,6 @@ public final class BuildOptions implements Cloneable, Serializable { } /** - * Returns {@code true} if static configurations should be used with - * {@link BuildConfiguration.Options.DynamicConfigsMode.NOTRIM_PARTIAL}. - */ - public boolean useStaticConfigurationsOverride() { - for (FragmentOptions fragment : fragmentOptionsMap.values()) { - if (fragment.useStaticConfigurationsOverride()) { - return true; - } - } - return false; - } - - /** * Returns true if actions should be enabled for this configuration. */ public boolean enableActions() { |