diff options
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java index bee1080932..4ff32f1e02 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java @@ -35,7 +35,6 @@ import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.runtime.BlazeModule; import com.google.devtools.build.lib.runtime.BuildEventStreamer; -import com.google.devtools.build.lib.runtime.Command; import com.google.devtools.build.lib.runtime.CommandEnvironment; import com.google.devtools.build.lib.runtime.SynchronizedOutputStream; import com.google.devtools.build.lib.util.AbruptExitException; @@ -63,7 +62,7 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions private Set<BuildEventTransport> transports = ImmutableSet.of(); @Override - public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) { + public Iterable<Class<? extends OptionsBase>> getCommonCommandOptions() { return ImmutableList.of(optionsClass(), AuthAndTLSOptions.class, BuildEventStreamOptions.class); } diff --git a/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java b/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java index e365f8c98d..2b3afda7cd 100644 --- a/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java +++ b/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java @@ -122,7 +122,7 @@ public class BazelBuildEventServiceModuleTest { @Test public void testReturnsBuildEventStreamerOptions() throws Exception { BazelBuildEventServiceModule module = new BazelBuildEventServiceModule(); - Iterable<Class<? extends OptionsBase>> commandOptions = module.getCommandOptions(command); + Iterable<Class<? extends OptionsBase>> commandOptions = module.getCommonCommandOptions(); assertThat(commandOptions).isNotEmpty(); OptionsParser optionsParser = OptionsParser.newOptionsParser(commandOptions); optionsParser.parse( |