From 05fec1073db4a1f74e5e22ca6577a9d116f269b1 Mon Sep 17 00:00:00 2001 From: cushon Date: Fri, 8 Jun 2018 09:24:14 -0700 Subject: [PATCH] Prepare to remove java_toolchain.encoding UTF-8 is the only supported encoding for Java sources. See #2926. PiperOrigin-RevId: 199803902 --- .../google/devtools/build/lib/rules/java/JavaToolchain.java | 4 ---- .../devtools/build/lib/rules/java/JavaToolchainRule.java | 1 - 2 files changed, 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 index 736b01da92d3f0..9347485207efed 100644 --- 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 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 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 index 7459450775f925..2366413fbe8b83 100644 --- 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",