Fix encoding of non-ascii contents written to parameter files.

Author: zhengwei143

src/main/java/com/google/devtools/build/lib/actions/BUILD

@@ -192,6 +192,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
         "//src/main/java/com/google/devtools/build/lib/util:os",
         "//src/main/java/com/google/devtools/build/lib/util:shell_escaper",
+        "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/lib/util:var_int",
         "//src/main/java/com/google/devtools/build/lib/util/io",
         "//src/main/java/com/google/devtools/build/lib/vfs",

src/main/java/com/google/devtools/build/lib/actions/ParameterFile.java

@@ -25,6 +25,7 @@
 import com.google.devtools.build.lib.util.GccParamFileEscaper;
 import com.google.devtools.build.lib.util.ShellEscaper;
 import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.devtools.build.lib.util.StringUtil;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -33,6 +34,7 @@
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.util.stream.StreamSupport;
 
 /**
  * Support for parameter file generation (as used by gcc and other tools, e.g.
@@ -119,7 +121,11 @@ private static void writeContent(
     if (charset.equals(ISO_8859_1)) {
       writeContentLatin1(outputStream, arguments);
     } else if (charset.equals(UTF_8)) {
-      writeContentUtf8(outputStream, arguments);
+      ImmutableList<String> args =
+          StreamSupport.stream(arguments.spliterator(), /* parallel= */ false)
+              .map(StringUtil::decodeBytestringUtf8)
+              .collect(ImmutableList.toImmutableList());
+      writeContentUtf8(outputStream, args);
     } else {
       // Generic charset support
       OutputStreamWriter out = new OutputStreamWriter(outputStream, charset);