1 files changed, 2 insertions, 35 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java b/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java
index bae41d869f..c94863ed86 100644
--- a/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/util/OptionsUtils.java
@@ -17,8 +17,6 @@ package com.google.devtools.build.lib.util;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.common.options.Converter;
-import com.google.devtools.common.options.Converters;
-import com.google.devtools.common.options.OptionsParsingException;
 import com.google.devtools.common.options.OptionsProvider;
 import com.google.devtools.common.options.ParsedOptionDescription;
 import java.util.ArrayList;
@@ -43,23 +41,7 @@ public final class OptionsUtils {
       if (result.length() != 0) {
         result.append(' ');
       }
-      String value = option.getUnconvertedValue();
-      if (option.isBooleanOption()) {
-        boolean isEnabled = false;
-        try {
-          isEnabled = new Converters.BooleanConverter().convert(value);
-        } catch (OptionsParsingException e) {
-          throw new RuntimeException("Unexpected parsing exception", e);
-        }
-        result
-            .append(isEnabled ? "--" : "--no")
-            .append(option.getOptionDefinition().getOptionName());
-      } else {
-        result.append("--").append(option.getOptionDefinition().getOptionName());
-        if (value != null) { // Can be null for Void options.
-          result.append("=").append(ShellEscaper.escapeString(value));
-        }
-      }
+      result.append(option.getCanonicalFormWithValueEscaper(ShellEscaper::escapeString));
     }
     return result.toString();
   }
@@ -82,22 +64,7 @@ public final class OptionsUtils {
       if (option.isHidden()) {
         continue;
       }
-      String value = option.getUnconvertedValue();
-      if (option.isBooleanOption()) {
-        boolean isEnabled = false;
-        try {
-          isEnabled = new Converters.BooleanConverter().convert(value);
-        } catch (OptionsParsingException e) {
-          throw new RuntimeException("Unexpected parsing exception", e);
-        }
-        builder.add((isEnabled ? "--" : "--no") + option.getOptionDefinition().getOptionName());
-      } else {
-        String optionString = "--" + option.getOptionDefinition().getOptionName();
-        if (value != null) { // Can be null for Void options.
-          optionString += "=" + value;
-        }
-        builder.add(optionString);
-      }
+      builder.add(option.getCanonicalForm());
     }
     return builder.build();
   }