From 75c88b8e0a7d793ccbe65efa20bde32007bd35ca Mon Sep 17 00:00:00 2001 From: Alex Humesky Date: Sat, 19 Nov 2016 01:11:52 +0000 Subject: Rollback of commit e860316559eac366d47923a8eb4b5489a661aa35. *** Reason for rollback *** -- MOS_MIGRATED_REVID=139640949 --- .../google/devtools/build/lib/remote/RemoteModule.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java') diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java index 7d2845c6ff..52343b0799 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java @@ -24,10 +24,6 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.runtime.BlazeModule; import com.google.devtools.build.lib.runtime.Command; import com.google.devtools.build.lib.runtime.CommandEnvironment; -import com.google.devtools.build.lib.util.AbruptExitException; -import com.google.devtools.build.lib.util.ExitCode; -import com.google.devtools.build.lib.vfs.FileSystem; -import com.google.devtools.build.lib.vfs.FileSystem.HashFunction; import com.google.devtools.common.options.OptionsBase; /** RemoteModule provides distributed cache and remote execution for Bazel. */ @@ -70,17 +66,8 @@ public final class RemoteModule extends BlazeModule { } // Otherwise actionCache remains null and remote caching/execution are disabled. - if (actionCache != null) { - HashFunction hf = FileSystem.getDigestFunction(); - if (hf != HashFunction.SHA1) { - env.getBlazeModuleEnvironment().exit(new AbruptExitException( - "Remote cache/execution requires SHA1 digests, got " + hf - + ", run with --host_jvm_args=-Dbazel.DigestFunction=SHA1", - ExitCode.COMMAND_LINE_ERROR)); - } - if (RemoteWorkExecutor.isRemoteExecutionOptions(options)) { - workExecutor = new RemoteWorkExecutor(options); - } + if (actionCache != null && RemoteWorkExecutor.isRemoteExecutionOptions(options)) { + workExecutor = new RemoteWorkExecutor(options); } } catch (InvalidConfigurationException e) { env.getReporter().handle(Event.warn(e.toString())); -- cgit v1.2.3