diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java index 204610213d7df9..d27a6f973d2a2a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/Compression.java @@ -19,9 +19,4 @@ public enum Compression { DISALLOW, /** May compress. */ ALLOW; - - /** Maps true/false to allow/disallow respectively. */ - public static Compression fromBoolean(boolean allow) { - return allow ? ALLOW : DISALLOW; - } } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java index e436eeae89fed1..af05fc13f8719f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java @@ -149,9 +149,8 @@ public static FileWriteAction create( /** * Creates a new FileWriteAction instance. * - *

There are no inputs. Transparent compression is controlled by the {@code - * --experimental_transparent_compression} flag. No reference to the {@link - * ActionConstructionContext} will be maintained. + *

There are no inputs. No reference to the {@link ActionConstructionContext} will be + * maintained. * * @param context the action construction context * @param output the Artifact that will be created by executing this Action @@ -169,7 +168,7 @@ public static FileWriteAction create( output, fileContents, makeExecutable, - context.getConfiguration().transparentCompression()); + Compression.ALLOW); } private static final class CompressedString extends LazyString { 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 4e399c3a64d71d..eb873f7f9d8d40 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 @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.actions.BuildConfigurationEvent; import com.google.devtools.build.lib.actions.CommandLines.CommandLineLimits; import com.google.devtools.build.lib.analysis.BlazeDirectories; -import com.google.devtools.build.lib.analysis.actions.Compression; import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId; @@ -708,14 +707,6 @@ public List