diff options
| author |  cushon <cushon@google.com> | 2018-06-08 09:24:14 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-08 09:25:28 -0700 |
| commit | 05fec1073db4a1f74e5e22ca6577a9d116f269b1 (patch) | |
| tree | 55ae64e7829546666c778f60aa5366969de71fe8 | |
| parent | 72660e2293d873ab3170891d87d7a564c6a3513f (diff) | |
Prepare to remove java_toolchain.encoding
UTF-8 is the only supported encoding for Java sources.
See #2926.
PiperOrigin-RevId: 199803902
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java | 1 |
2 files changed, 0 insertions, 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 736b01da92..9347485207 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 @@ public class JavaToolchain implements RuleConfiguredTargetFactory { 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 index 7459450775..2366413fbe 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 @@ java_toolchain( 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", |