Prepare to remove java_toolchain.encoding

UTF-8 is the only supported encoding for Java sources. See #2926. PiperOrigin-RevId: 199803902
bazelbuild · Jun 8, 2018 · 05fec10 · 05fec10
1 parent 72660e2
commit 05fec10
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java
@@ -140,10 +140,6 @@ private ImmutableList<String> getJavacOpts(RuleContext ruleContext) {
     if (!isNullOrEmpty(target)) {
       javacopts.add("-target").add(target);
     }
-    String encoding = ruleContext.attributes().get("encoding", Type.STRING);
-    if (!isNullOrEmpty(encoding)) {
-      javacopts.add("-encoding", encoding);
-    }
     List<String> xlint = ruleContext.attributes().get("xlint", Type.STRING_LIST);
     if (!xlint.isEmpty()) {
       javacopts.add("-Xlint:" + Joiner.on(",").join(xlint));

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
@@ -254,7 +254,6 @@ public Metadata getMetadata() {
     source_version = "7",
     target_version = "7",
     bootclasspath = ["//tools/jdk:bootclasspath"],
-    encoding = "UTF-8",
     xlint = [ "classfile", "divzero", "empty", "options", "path" ],
     javacopts = [ "-g" ],
     javabuilder = ":JavaBuilder_deploy.jar",