Make --symlink_prefix= work as expected again (i.e. create links called "bin"/"genfiles" instead of the default ones)

--
MOS_MIGRATED_REVID=108699595

2 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
index 63b7174cf9..8268d38c33 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
@@ -106,7 +106,7 @@ public final class CleanCommand implements BlazeCommand {
     env.getReporter().handle(Event.info(null/*location*/, cleanBanner));
     try {
       String symlinkPrefix =
-          options.getOptions(BuildRequest.BuildRequestOptions.class).symlinkPrefix;
+          options.getOptions(BuildRequest.BuildRequestOptions.class).getSymlinkPrefix();
       actuallyClean(env, runtime.getOutputBase(), cleanOptions, symlinkPrefix);
       return ExitCode.SUCCESS;
     } catch (IOException e) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
index f2aaf449bf..2328d494b5 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java
@@ -243,7 +243,7 @@ public class RunCommand implements BlazeCommand  {
     PathFragment prettyExecutablePath =
         OutputDirectoryLinksUtils.getPrettyPath(executablePath,
             runtime.getWorkspaceName(), runtime.getWorkspace(),
-            options.getOptions(BuildRequestOptions.class).symlinkPrefix);
+            options.getOptions(BuildRequestOptions.class).getSymlinkPrefix());
     List<String> cmdLine = new ArrayList<>();
     if (runOptions.scriptPath == null) {
       cmdLine.add(runtime.getDirectories().getExecRoot()